[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

andersca at apple.com andersca at apple.com
Wed Dec 22 18:08:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8336794a70de669d120e8f9340769f5a18560a1e
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 22:21:28 2010 +0000

    Fix clang++ build
    https://bugs.webkit.org/show_bug.cgi?id=50645
    
    Reviewed by Darin Adler.
    
    Explicitly cast offset to int.
    
    * pcre/pcre_ucp_searchfuncs.cpp:
    (jsc_pcre_ucp_othercase):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1092cff..d335935 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-07  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix clang++ build
+        https://bugs.webkit.org/show_bug.cgi?id=50645
+
+        Explicitly cast offset to int.
+
+        * pcre/pcre_ucp_searchfuncs.cpp:
+        (jsc_pcre_ucp_othercase):
+
 2010-12-07  Kenneth Russell  <kbr at google.com>
 
         Reviewed by David Levin.
diff --git a/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp b/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp
index 5592865..5c63c20 100644
--- a/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp
+++ b/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp
@@ -95,5 +95,5 @@ int jsc_pcre_ucp_othercase(unsigned c)
     int offset = ucp_table[mid].f1 & f1_casemask;
     if (offset & f1_caseneg)
         offset |= f1_caseneg;
-    return !offset ? -1 : c + offset;
+    return !offset ? -1 : c + static_cast<int>(offset);
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list