Handle UChar != char16_t

apertium · Jul 1, 2021 · f45b149 · f45b149
1 parent 152691a
commit f45b149
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/configure.ac b/configure.ac
@@ -40,6 +40,14 @@ AX_CHECK_COMPILE_FLAG([-std=c++20], [CXXFLAGS="$CXXFLAGS -std=c++20"], [
  ])
 ])
 
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <unicode/umachine.h>
+#include <type_traits>
+]],[[
+using namespace std;
+static_assert(!is_same<UChar,char16_t>::value, "UChar == char16_t");
+   ]])], [AC_DEFINE([UCHAR_NOT_CHAR16_T], [1], [UChar != char16_t])])
+
 AC_CONFIG_FILES([
                  apertium-anaphora.pc
                  Makefile

diff --git a/src/parse_arx.h b/src/parse_arx.h
@@ -40,6 +40,17 @@ struct markable_pattern
 	int head;
 };
 
+#ifdef UCHAR_NOT_CHAR16_T
+namespace std {
+    template<> struct hash<UString> {
+		size_t operator ()(const UString& str) const {
+			auto u16 = reinterpret_cast<const std::u16string*>(&str);
+			return std::hash<std::u16string>{}(*u16);
+		}
+	};
+}
+#endif
+
 typedef vector< vector<markable_pattern> > acceptable_patterns;
 
 typedef unordered_map< UString, unordered_map<UString, acceptable_tags> > parameters_datatype;