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

[Gustavo Noronha Silva]

The following commit has been merged in the webkit-1.2 branch:
commit 40da6ca560771e18381d7203047c909226e8eb12
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 24 03:17:44 2010 +0000

    Build fix.
    
    * runtime/ArrayPrototype.cpp:
    (JSC::arrayProtoFuncSplice): Some versions of GCC emit a warning about the implicit 64- to 32-bit truncation
    that takes place here. An explicit cast is sufficient to silence it.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56432 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3dbba7b..f455975 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-23  Mark Rowe  <mrowe at apple.com>
+
+        Build fix.
+
+        * runtime/ArrayPrototype.cpp:
+        (JSC::arrayProtoFuncSplice): Some versions of GCC emit a warning about the implicit 64- to 32-bit truncation
+        that takes place here. An explicit cast is sufficient to silence it.
+
 2010-03-23  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/JavaScriptCore/runtime/ArrayPrototype.cpp b/JavaScriptCore/runtime/ArrayPrototype.cpp
index 99e3d4e..5b5a0e2 100644
--- a/JavaScriptCore/runtime/ArrayPrototype.cpp
+++ b/JavaScriptCore/runtime/ArrayPrototype.cpp
@@ -518,7 +518,7 @@ JSValue JSC_HOST_CALL arrayProtoFuncSplice(ExecState* exec, JSObject*, JSValue t
         relativeBegin += length;
         begin = (relativeBegin < 0) ? 0 : static_cast<unsigned>(relativeBegin);
     } else
-        begin = std::min<unsigned>(relativeBegin, length);
+        begin = std::min<unsigned>(static_cast<unsigned>(relativeBegin), length);
 
     unsigned deleteCount;
     if (args.size() > 1)

-- 
WebKit Debian packaging