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

[beidson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 069c8facd1ddfc25764ca55365dbce9894e7b964
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 23:45:23 2010 +0000

    Cast the return value for the templated ImmutableArray::at().
    
    Reviewed by Sam Weinig.
    
    * Shared/ImmutableArray.h:
    (WebKit::ImmutableArray::at):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64387 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f87bb12..af3f9a3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-30  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Cast the return value for the templated ImmutableArray::at().
+
+        * Shared/ImmutableArray.h:
+        (WebKit::ImmutableArray::at):
+
 2010-07-30  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/Shared/ImmutableArray.h b/WebKit2/Shared/ImmutableArray.h
index 1f414cf..db1f6bf 100644
--- a/WebKit2/Shared/ImmutableArray.h
+++ b/WebKit2/Shared/ImmutableArray.h
@@ -52,7 +52,7 @@ public:
     ~ImmutableArray();
 
     template<typename T>
-    T* at(size_t i) { ASSERT(i < m_size); if (m_entries[i]->type() != T::APIType) return 0; return m_entries[i]; }
+    T* at(size_t i) { ASSERT(i < m_size); if (m_entries[i]->type() != T::APIType) return 0; return static_cast<T*>(m_entries[i]); }
 
     APIObject* at(size_t i) { ASSERT(i < m_size); return m_entries[i]; }
     size_t size() { return m_size; }

-- 
WebKit Debian packaging