Changeset 216187 in webkit for trunk/Source/JavaScriptCore/runtime/DateConversion.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/runtime/DateConversion.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/DateConversion.cpp

@@ -108 +108 @@
             TIME_ZONE_INFORMATION timeZoneInformation;
             GetTimeZoneInformation(&timeZoneInformation);
-            const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
+            const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
+            String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
 #else
             struct tm gtm = t;
@@ -116 +117 @@
             if (timeZoneName[0]) {
                 builder.appendLiteral(" (");
-#if OS(WINDOWS)
-                builder.append(String(timeZoneName));
-#else
                 builder.append(timeZoneName);
-#endif
                 builder.append(')');
             }