From a7b134ae44bc03fc0a4427d750b32d50625a37ce Mon Sep 17 00:00:00 2001
From: Andreas Kling <andreas.kling@nokia.com>
Date: Wed, 8 Jun 2011 12:45:38 +0200
Subject: Make Float32Array and Int16Array build on RVCT 2.x.

Partial merge of <http://trac.webkit.org/changeset/88336>.
---
 src/3rdparty/webkit/Source/WebCore/html/canvas/Float32Array.h | 3 ++-
 src/3rdparty/webkit/Source/WebCore/html/canvas/Int16Array.h   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/Float32Array.h b/src/3rdparty/webkit/Source/WebCore/html/canvas/Float32Array.h
index ee1ea56..5ea7d8d 100644
--- a/src/3rdparty/webkit/Source/WebCore/html/canvas/Float32Array.h
+++ b/src/3rdparty/webkit/Source/WebCore/html/canvas/Float32Array.h
@@ -38,7 +38,8 @@ public:
     static PassRefPtr<Float32Array> create(const float* array, unsigned length);
     static PassRefPtr<Float32Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);
 
-    using TypedArrayBase<float>::set;
+    // Can’t use "using" here due to a bug in the RVCT compiler.
+    void set(TypedArrayBase<float>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<float>::set(array, offset, ec); }
 
     void set(unsigned index, double value)
     {
diff --git a/src/3rdparty/webkit/Source/WebCore/html/canvas/Int16Array.h b/src/3rdparty/webkit/Source/WebCore/html/canvas/Int16Array.h
index 6c4f54b..2e1f254 100644
--- a/src/3rdparty/webkit/Source/WebCore/html/canvas/Int16Array.h
+++ b/src/3rdparty/webkit/Source/WebCore/html/canvas/Int16Array.h
@@ -38,8 +38,9 @@ public:
     static PassRefPtr<Int16Array> create(short* array, unsigned length);
     static PassRefPtr<Int16Array> create(PassRefPtr<ArrayBuffer> buffer, unsigned byteOffset, unsigned length);
 
-    using TypedArrayBase<short>::set;
-    using IntegralTypedArrayBase<short>::set;
+    // Can’t use "using" here due to a bug in the RVCT compiler.
+    void set(TypedArrayBase<short>* array, unsigned offset, ExceptionCode& ec) { TypedArrayBase<short>::set(array, offset, ec); }
+    void set(unsigned index, double value) { IntegralTypedArrayBase<short>::set(index, value); }
 
     PassRefPtr<Int16Array> subarray(int start) const;
     PassRefPtr<Int16Array> subarray(int start, int end) const;
-- 
cgit v0.12