Changeset 216187 in webkit for trunk/Source/JavaScriptCore/API/JSStringRef.cpp

Timestamp:

May 4, 2017, 8:33:41 AM (8 years ago)

Author:

Konstantin Tokarev

Message:

Fix compilation with ICU 59.1
​https://bugs.webkit.org/show_bug.cgi?id=171612

Reviewed by Mark Lam.

ICU 59.1 has broken source compatibility. Now it defines UChar as
char16_t, which does not allow automatic type conversion from unsigned
short in C++ code.

Source/JavaScriptCore:

• API/JSStringRef.cpp:

(JSStringCreateWithCharacters):
(JSStringCreateWithCharactersNoCopy):
(JSStringGetCharactersPtr):

• runtime/DateConversion.cpp:

(JSC::formatDateTime):

Source/WebKit2:

• Shared/API/c/WKString.cpp:

(WKStringGetCharacters):

Tools:

• TestRunnerShared/UIScriptContext/UIScriptContext.cpp:

(UIScriptContext::tryToCompleteUIScriptForCurrentParentCallback):

File:

• trunk/Source/JavaScriptCore/API/JSStringRef.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/API/JSStringRef.cpp

@@ -38 +38 @@
 {
     initializeThreading();
-    return &OpaqueJSString::create(chars, numChars).leakRef();
+    return &OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
 }
 
@@ -63 +63 @@
 {
     initializeThreading();
-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars)).leakRef();
+    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars)).leakRef();
 }
 
@@ -88 +88 @@
     if (!string)
         return nullptr;
-    return string->characters();
+    return reinterpret_cast<const JSChar*>(string->characters());
 }