Title: [220585] trunk/Source/WebKit
Revision
220585
Author
ape...@igalia.com
Date
2017-08-11 06:25:57 -0700 (Fri, 11 Aug 2017)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (220584 => 220585)


--- trunk/Source/WebKit/ChangeLog	2017-08-11 12:28:21 UTC (rev 220584)
+++ trunk/Source/WebKit/ChangeLog	2017-08-11 13:25:57 UTC (rev 220585)
@@ -1,3 +1,14 @@
+2017-08-11  Adrian Perez de Castro  <ape...@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  <cgar...@igalia.com>
 
         [Soup] Cannot access HTTPS sites using a HTTP proxy that requires authentication

Modified: trunk/Source/WebKit/Shared/wpe/WebEventFactory.cpp (220584 => 220585)


--- trunk/Source/WebKit/Shared/wpe/WebEventFactory.cpp	2017-08-11 12:28:21 UTC (rev 220584)
+++ trunk/Source/WebKit/Shared/wpe/WebEventFactory.cpp	2017-08-11 13:25:57 UTC (rev 220585)
@@ -59,7 +59,7 @@
     glong length;
     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();
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to