diff options
| author |  tfarina <tfarina@chromium.org> | 2014-12-17 17:50:21 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-17 17:50:22 -0800 |
| commit | e3d5c7f5a901a083b818fe628281c39d1281efeb (patch) | |
| tree | dca84cd703bf371700958ceea8f747604058acc7 /src | |
| parent | 602a7428a37804706268e5fe1ddef7e3eb9980a4 (diff) | |
Cleanup: More override fixes.
Fixes errors like:
../../src/gpu/GrGeometryProcessor.h:172:25: error: 'name' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
virtual const char* name() const = 0;
^
../../include/gpu/GrProcessor.h:66:25: note: overridden virtual function is here
virtual const char* name() const = 0;
BUG=skia:3075
TEST=ninja -C out/Debug skia_lib
TBR=mtklein@google.com
Review URL: https://codereview.chromium.org/789343003
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrGeometryProcessor.h | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrCoverageSetOpXP.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gpu/GrGeometryProcessor.h b/src/gpu/GrGeometryProcessor.h index f3ae800b80..f3ec0b5af3 100644 --- a/src/gpu/GrGeometryProcessor.h +++ b/src/gpu/GrGeometryProcessor.h @@ -169,8 +169,6 @@ public: , fHasVertexColor(false) , fHasLocalCoords(false) {} - virtual const char* name() const = 0; - /* * This is a safeguard to prevent GPs from going beyond platform specific attribute limits. * This number can almost certainly be raised if required. diff --git a/src/gpu/effects/GrCoverageSetOpXP.h b/src/gpu/effects/GrCoverageSetOpXP.h index 8f85d0688e..327d3c01f0 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.h +++ b/src/gpu/effects/GrCoverageSetOpXP.h @@ -28,7 +28,7 @@ public: ~GrCoverageSetOpXP() SK_OVERRIDE; - virtual const char* name() const { return "Coverage Set Op"; } + virtual const char* name() const SK_OVERRIDE { return "Coverage Set Op"; } void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; |