commit 75ec7c5bda0d57d216527500ff431429cde9f3ba
author Andrew Knight <andrew.knight@digia.com> Thu Jul 17 15:00:38 2014 +0300
committer Brandon Jones <bajones@chromium.org> Thu Jul 17 17:38:47 2014 +0000
tree ad9e3c30f933fc9272bc6f33eb2e745a3f4e088e
parent 5b130dcc0f273a7a5ce8c17172bd4d1ce7e0d1be

Fix "error: extra qualification 'rx::ImageD3D::' on member 'makeImageD3D'"

As reported by GCC 4.8.1/MinGW.

Change-Id: If62d234074a0a9180f1f3c3619dbb2dd8047d0f3
Reviewed-on: https://chromium-review.googlesource.com/208670
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Tested-by: Andrew Knight <andrew.knight@digia.com>

CONTRIBUTORS

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fcb6315..7d152e7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -52,6 +52,9 @@
 Cloud Party, Inc.
  Conor Dickinson
 
+Digia Plc
+ Andrew Knight
+
 Intel Corporation
  Jin Yang
  Andy Chen

src/libGLESv2/renderer/d3d/ImageD3D.h

diff --git a/src/libGLESv2/renderer/d3d/ImageD3D.h b/src/libGLESv2/renderer/d3d/ImageD3D.h
index c8297dd..242ce5a 100644
--- a/src/libGLESv2/renderer/d3d/ImageD3D.h
+++ b/src/libGLESv2/renderer/d3d/ImageD3D.h
@@ -32,7 +32,7 @@
     ImageD3D();
     virtual ~ImageD3D() {};
 
-    static ImageD3D *ImageD3D::makeImageD3D(Image *img);
+    static ImageD3D *makeImageD3D(Image *img);
 
     virtual bool isDirty() const = 0;