[patch] Patch to change jschar to char16_t

patch.patch (text/plain), 1.78 KB, created by Luigi 'Comio' Mantellini on 2017-06-20 09:51:32 UTC

--- mozjs-24.2.0/mfbt/TypeTraits.h.orig	2017-06-20 11:19:32.973406100 +0200
+++ mozjs-24.2.0/mfbt/TypeTraits.h	2017-06-20 11:20:31.086519471 +0200
@@ -62,6 +62,7 @@
 template<> struct IsIntegralHelper<unsigned long long> : TrueType {};
 template<> struct IsIntegralHelper<bool>               : TrueType {};
 template<> struct IsIntegralHelper<wchar_t>            : TrueType {};
+template<> struct IsIntegralHelper<char16_t>            : TrueType {};
 
 } /* namespace detail */
 
@@ -195,6 +196,7 @@
 template<> struct IsPod<float>              : TrueType {};
 template<> struct IsPod<double>             : TrueType {};
 template<> struct IsPod<wchar_t>            : TrueType {};
+template<> struct IsPod<char16_t>           : TrueType {};
 template<typename T> struct IsPod<T*>       : TrueType {};
 
 namespace detail {
--- mozjs-24.2.0/mfbt/HashFunctions.h.orig	2017-06-20 11:06:25.080367614 +0200
+++ mozjs-24.2.0/mfbt/HashFunctions.h	2017-06-20 11:10:17.441571838 +0200
@@ -324,6 +324,20 @@
   return detail::HashKnownLength(str, length);
 }
 
+MOZ_WARN_UNUSED_RESULT
+inline uint32_t
+HashString(const char16_t* str)
+{
+  return detail::HashUntilZero(str);
+}
+
+MOZ_WARN_UNUSED_RESULT
+inline uint32_t
+HashString(const char16_t* str, size_t length)
+{
+  return detail::HashKnownLength(str, length);
+}
+
 /*
  * On Windows, wchar_t (PRUnichar) is not the same as uint16_t, even though it's
  * the same width!
--- mozjs-24.2.0/js/src/jspubtd.h.orig	2017-06-20 11:03:33.880532875 +0200
+++ mozjs-24.2.0/js/src/jspubtd.h	2017-06-20 11:04:29.189771798 +0200
@@ -64,8 +64,12 @@
 #ifdef WIN32
 typedef wchar_t   jschar;
 #else
+#if __cplusplus>=201103L
+typedef char16_t  jschar;
+#else
 typedef uint16_t  jschar;
 #endif
+#endif
 
 /*
  * Run-time version enumeration.  For compile-time version checking, please use