diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-05-04 15:12:37 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-06-16 12:46:36 +0000 |
| commit | bf172ae289a1348842005a9421797970f9b72060 (patch) | |
| tree | b189080055e42fbf3ba1d769ce3e5cffc5ec1477 /Source/WTF/wtf/TypeTraits.h | |
| parent | 821eaaadc9d63d03aca65cf757230b520daaaa7c (diff) | |
| download | qtwebkit-bf172ae289a1348842005a9421797970f9b72060.tar.gz | |
Fix compilation with ICU 595.9.1
Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
Task-number: QTBUG-60532
Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'Source/WTF/wtf/TypeTraits.h')
| -rw-r--r-- | Source/WTF/wtf/TypeTraits.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h index 9df2c95cf..f5d6121fd 100644 --- a/Source/WTF/wtf/TypeTraits.h +++ b/Source/WTF/wtf/TypeTraits.h @@ -72,6 +72,9 @@ namespace WTF { template<> struct IsInteger<unsigned long> { static const bool value = true; }; template<> struct IsInteger<long long> { static const bool value = true; }; template<> struct IsInteger<unsigned long long> { static const bool value = true; }; +#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) + template<> struct IsInteger<char16_t> { static const bool value = true; }; +#endif #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) template<> struct IsInteger<wchar_t> { static const bool value = true; }; #endif |