Attachment #477312 for bug #620764

Lines 62-67 Link Here

(-)mozjs-24.2.0/mfbt/TypeTraits.h.orig (+2 lines)
62	template<> struct IsIntegralHelper<unsigned long long> : TrueType {};	62	template<> struct IsIntegralHelper<unsigned long long> : TrueType {};
63	template<> struct IsIntegralHelper<bool> : TrueType {};	63	template<> struct IsIntegralHelper<bool> : TrueType {};
64	template<> struct IsIntegralHelper<wchar_t> : TrueType {};	64	template<> struct IsIntegralHelper<wchar_t> : TrueType {};
		65	template<> struct IsIntegralHelper<char16_t> : TrueType {};
65		66
66	} /* namespace detail */	67	} /* namespace detail */
67		68
Lines 195-200 Link Here
195	template<> struct IsPod<float> : TrueType {};	196	template<> struct IsPod<float> : TrueType {};
196	template<> struct IsPod<double> : TrueType {};	197	template<> struct IsPod<double> : TrueType {};
197	template<> struct IsPod<wchar_t> : TrueType {};	198	template<> struct IsPod<wchar_t> : TrueType {};
		199	template<> struct IsPod<char16_t> : TrueType {};
198	template<typename T> struct IsPod<T*> : TrueType {};	200	template<typename T> struct IsPod<T*> : TrueType {};
199		201
200	namespace detail {	202	namespace detail {




  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!

Lines 64-71 Link Here

(-)mozjs-24.2.0/js/src/jspubtd.h.orig (+4 lines)
64	#ifdef WIN32	64	#ifdef WIN32
65	typedef wchar_t jschar;	65	typedef wchar_t jschar;
66	#else	66	#else
		67	#if __cplusplus>=201103L
		68	typedef char16_t jschar;
		69	#else
67	typedef uint16_t jschar;	70	typedef uint16_t jschar;
68	#endif	71	#endif
		72	#endif
69		73
70	/*	74	/*
71	* Run-time version enumeration. For compile-time version checking, please use	75	* Run-time version enumeration. For compile-time version checking, please use

Return to bug 620764

Lines 324-329 Link Here

(-)mozjs-24.2.0/mfbt/HashFunctions.h.orig (+14 lines)
324	return detail::HashKnownLength(str, length);	324	return detail::HashKnownLength(str, length);
325	}	325	}
326		326
		327	MOZ_WARN_UNUSED_RESULT
		328	inline uint32_t
		329	HashString(const char16_t* str)
		330	{
		331	return detail::HashUntilZero(str);
		332	}
		333
		334	MOZ_WARN_UNUSED_RESULT
		335	inline uint32_t
		336	HashString(const char16_t* str, size_t length)
		337	{
		338	return detail::HashKnownLength(str, length);
		339	}
		340
327	/*	341	/*
328	* On Windows, wchar_t (PRUnichar) is not the same as uint16_t, even though it's	342	* On Windows, wchar_t (PRUnichar) is not the same as uint16_t, even though it's
329	* the same width!	343	* the same width!