commit 7096dc6b27892e157403e0631b2f284d95529626
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 11 18:01:50 2012 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri May 11 18:01:50 2012 +0000
tree 1ea1529d067a9a2230366d0617366414c22be291
parent 7ffe6810c6787f7a353ef3fe8fab3fc6440aae19

fix SK_RESTRICT warnings related to overrides on windows



git-svn-id: http://skia.googlecode.com/svn/trunk@3913 2bbb7eff-a529-9590-31e7-b0007b416f81

src/effects/SkGradientShader.cpp

diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp
index 8b78984..6de820b 100644
--- a/src/effects/SkGradientShader.cpp
+++ b/src/effects/SkGradientShader.cpp
@@ -1370,10 +1370,12 @@
 
     virtual void shadeSpan(int x, int y, SkPMColor* dstC, int count)
         SK_OVERRIDE;
-    virtual void shadeSpan16(int x, int y, uint16_t* SK_RESTRICT dstC,
+    virtual void shadeSpan16(int x, int y, uint16_t* dstCParam,
                              int count) SK_OVERRIDE {
         SkASSERT(count > 0);
 
+        uint16_t* SK_RESTRICT dstC = dstCParam;
+
         SkPoint             srcPt;
         SkMatrix::MapXYProc dstProc = fDstToIndexProc;
         TileProc            proc = fTileProc;
@@ -1902,10 +1904,12 @@
         return kRadial2_GradientType;
     }
 
-    virtual void shadeSpan(int x, int y, SkPMColor* SK_RESTRICT dstC,
+    virtual void shadeSpan(int x, int y, SkPMColor* dstCParam,
                            int count) SK_OVERRIDE {
         SkASSERT(count > 0);
 
+        SkPMColor* SK_RESTRICT dstC = dstCParam;
+
         // Zero difference between radii:  fill with transparent black.
         if (fDiffRadius == 0) {
           sk_bzero(dstC, count * sizeof(*dstC));