From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 4 May 2017 15:12:37 +0300 Subject: Fix compilation with ICU 59 Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 Task-number: QTBUG-60532 Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 Reviewed-by: Allan Sandfeld Jensen --- Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/JavaScriptCore/API/JSStringRef.cpp') 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(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(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(string->characters()); } size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) -- cgit v1.2.1