Title: [88336] trunk/Source/WebCore
- Revision
- 88336
- Author
- andreas.kl...@nokia.com
- Date
- 2011-06-08 03:52:40 -0700 (Wed, 08 Jun 2011)
Log Message
2011-06-08 Andreas Kling <andreas.kl...@nokia.com>
Reviewed by Laszlo Gombos.
[Symbian] Float{32,64}Array and Int16Array fail to build.
https://bugs.webkit.org/show_bug.cgi?id=62219
For some reason, RVCT 2.x is moaning about "class member designated by
a using-declaration must be visible in a direct base class".
Apply same fix as r69122 and r76592.
* html/canvas/Float32Array.h:
(WebCore::Float32Array::set):
* html/canvas/Float64Array.h:
(WebCore::Float64Array::set):
* html/canvas/Int16Array.h:
(WebCore::Int16Array::set):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (88335 => 88336)
--- trunk/Source/WebCore/ChangeLog 2011-06-08 10:33:12 UTC (rev 88335)
+++ trunk/Source/WebCore/ChangeLog 2011-06-08 10:52:40 UTC (rev 88336)
@@ -1,3 +1,21 @@
+2011-06-08 Andreas Kling <andreas.kl...@nokia.com>
+
+ Reviewed by Laszlo Gombos.
+
+ [Symbian] Float{32,64}Array and Int16Array fail to build.
+ https://bugs.webkit.org/show_bug.cgi?id=62219
+
+ For some reason, RVCT 2.x is moaning about "class member designated by
+ a using-declaration must be visible in a direct base class".
+ Apply same fix as r69122 and r76592.
+
+ * html/canvas/Float32Array.h:
+ (WebCore::Float32Array::set):
+ * html/canvas/Float64Array.h:
+ (WebCore::Float64Array::set):
+ * html/canvas/Int16Array.h:
+ (WebCore::Int16Array::set):
+
2011-06-08 Syed Idris Shah <syed.idris-s...@nokia.com>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebCore/html/canvas/Float32Array.h (88335 => 88336)
--- trunk/Source/WebCore/html/canvas/Float32Array.h 2011-06-08 10:33:12 UTC (rev 88335)
+++ trunk/Source/WebCore/html/canvas/Float32Array.h 2011-06-08 10:52:40 UTC (rev 88336)
@@ -38,7 +38,8 @@
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)
{
Modified: trunk/Source/WebCore/html/canvas/Float64Array.h (88335 => 88336)
--- trunk/Source/WebCore/html/canvas/Float64Array.h 2011-06-08 10:33:12 UTC (rev 88335)
+++ trunk/Source/WebCore/html/canvas/Float64Array.h 2011-06-08 10:52:40 UTC (rev 88336)
@@ -38,7 +38,8 @@
static PassRefPtr<Float64Array> create(const double* array, unsigned length);
static PassRefPtr<Float64Array> create(PassRefPtr<ArrayBuffer>, unsigned byteOffset, unsigned length);
- using TypedArrayBase<double>::set;
+ // Can’t use "using" here due to a bug in the RVCT compiler.
+ void set(TypedArrayBase<double>* array, unsigned offset, ExceptionCode& ec) { return TypedArrayBase<double>::set(array, offset, ec); }
void set(unsigned index, double value)
{
Modified: trunk/Source/WebCore/html/canvas/Int16Array.h (88335 => 88336)
--- trunk/Source/WebCore/html/canvas/Int16Array.h 2011-06-08 10:33:12 UTC (rev 88335)
+++ trunk/Source/WebCore/html/canvas/Int16Array.h 2011-06-08 10:52:40 UTC (rev 88336)
@@ -38,8 +38,9 @@
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
