[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[barraclough at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 9bdad1bed256e2acb5744316c0fe1b29eb178839
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 02:04:55 2009 +0000

    Fix breakage of world introduced in build fix to r52463.
    
    Reviewed by NOBODY (build fix).
    
    * runtime/UStringImpl.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52470 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d07c3a0..ff637af 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2009-12-21  Gavin Barraclough  <barraclough at apple.com>
 
+        Reviewed by NOBODY (build fix).
+        Fix breakage of world introduced in build fix to r52463.
+
+        * runtime/UStringImpl.h:
+
+2009-12-21  Gavin Barraclough  <barraclough at apple.com>
+
         Reviewed by Darin Adler.
 
         https://bugs.webkit.org/show_bug.cgi?id=32831
diff --git a/JavaScriptCore/runtime/UStringImpl.h b/JavaScriptCore/runtime/UStringImpl.h
index b509369..eee6210 100644
--- a/JavaScriptCore/runtime/UStringImpl.h
+++ b/JavaScriptCore/runtime/UStringImpl.h
@@ -70,7 +70,7 @@ public:
     }
 
 private:
-    static const uintptr_t s_alignmentMask = ~0x7u;
+    static const uintptr_t s_alignmentMask = ~static_cast<uintptr_t>(0x7);
     uintptr_t m_value;
 };
 

-- 
WebKit Debian packaging