From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 7 Nov 2012 11:22:47 +0100 Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733) New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes. --- Source/JavaScriptCore/runtime/JSONObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/JavaScriptCore/runtime/JSONObject.cpp') diff --git a/Source/JavaScriptCore/runtime/JSONObject.cpp b/Source/JavaScriptCore/runtime/JSONObject.cpp index fd939934e..e051ec7d9 100644 --- a/Source/JavaScriptCore/runtime/JSONObject.cpp +++ b/Source/JavaScriptCore/runtime/JSONObject.cpp @@ -294,7 +294,7 @@ static void appendStringToStringBuilder(StringBuilder& builder, const CharType* default: static const char hexDigits[] = "0123456789abcdef"; UChar ch = data[i]; - LChar hex[] = { '\\', 'u', hexDigits[(ch >> 12) & 0xF], hexDigits[(ch >> 8) & 0xF], hexDigits[(ch >> 4) & 0xF], hexDigits[ch & 0xF] }; + LChar hex[] = { '\\', 'u', static_cast(hexDigits[(ch >> 12) & 0xF]), static_cast(hexDigits[(ch >> 8) & 0xF]), static_cast(hexDigits[(ch >> 4) & 0xF]), static_cast(hexDigits[ch & 0xF]) }; builder.append(hex, WTF_ARRAY_LENGTH(hex)); break; } -- cgit v1.2.1