summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/API/JSStringRef.cpp
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2017-05-04 15:12:37 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2017-06-16 12:46:36 +0000
commitbf172ae289a1348842005a9421797970f9b72060 (patch)
treeb189080055e42fbf3ba1d769ce3e5cffc5ec1477 /Source/JavaScriptCore/API/JSStringRef.cpp
parent821eaaadc9d63d03aca65cf757230b520daaaa7c (diff)
downloadqtwebkit-5.9.1.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/JavaScriptCore/API/JSStringRef.cpp')
-rw-r--r--Source/JavaScriptCore/API/JSStringRef.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
index 812f3d413..77a3fd0f4 100644
--- a/Source/JavaScriptCore/API/JSStringRef.cpp
+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
{
initializeThreading();
- return OpaqueJSString::create(chars, numChars).leakRef();
+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
}
JSStringRef JSStringCreateWithUTF8CString(const char* string)
@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
{
initializeThreading();
- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
}
JSStringRef JSStringRetain(JSStringRef string)
@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
const JSChar* JSStringGetCharactersPtr(JSStringRef string)
{
- return string->characters();
+ return reinterpret_cast<const JSChar*>(string->characters());
}
size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)