Changeset 220585 in webkit

Timestamp:

Aug 11, 2017 6:25:57 AM (7 years ago)

Author:

Adrian Perez de Castro

Message:

[WPE] Build failure with Clang 4.0.1: no matching conversion for functional-style cast from 'pointer' (aka 'unsigned short *') to 'WTF::String'
​https://bugs.webkit.org/show_bug.cgi?id=175477

Reviewed by Žan Doberšek.

• Shared/wpe/WebEventFactory.cpp:

(WebKit::singleCharacterStringForKeyEvent): Cast to UChar* to make
compiler choose the correct WTF::String constructor.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/wpe/WebEventFactory.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-11  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Build failure with Clang 4.0.1: no matching conversion for functional-style cast from 'pointer' (aka 'unsigned short *') to 'WTF::String'
+        https://bugs.webkit.org/show_bug.cgi?id=175477
+
+        Reviewed by Žan Doberšek.
+
+        * Shared/wpe/WebEventFactory.cpp:
+        (WebKit::singleCharacterStringForKeyEvent): Cast to UChar* to make
+        compiler choose the correct WTF::String constructor.
+
 2017-08-11  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/Shared/wpe/WebEventFactory.cpp

@@ -60 +60 @@
     GUniquePtr<gunichar2> uchar16(g_ucs4_to_utf16(&event->unicode, 1, 0, &length, nullptr));
     if (uchar16)
-        return String(uchar16.get());
+        return String(reinterpret_cast<UChar*>(uchar16.get()), length);
     return String();
 }