From 36352bf5e38f45a70ee4f4fc132a38048d38206d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 25 Mar 2015 18:17:31 -0700 Subject: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002 --- bench/InterpBench.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bench/InterpBench.cpp') diff --git a/bench/InterpBench.cpp b/bench/InterpBench.cpp index c03da4b8cc..9d8f32de03 100644 --- a/bench/InterpBench.cpp +++ b/bench/InterpBench.cpp @@ -22,7 +22,7 @@ public: fDx = 0.1257f; } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -51,7 +51,7 @@ public: Fixed16D16Interp() : INHERITED("16.16") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { SkFixed curr = SkFloatToFixed(fx); SkFixed step = SkFloatToFixed(dx); for (int i = 0; i < count; i += 4) { @@ -70,7 +70,7 @@ public: Fixed32D32Interp() : INHERITED("32.32") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { int64_t curr = (int64_t)(fx * 65536 * 655536); int64_t step = (int64_t)(dx * 65536 * 655536); SkFixed tmp; @@ -101,7 +101,7 @@ public: Fixed16D48Interp() : INHERITED("16.48") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { int64_t curr = (int64_t)(fx * 65536 * 655536 * 65536); int64_t step = (int64_t)(dx * 65536 * 655536 * 65536); SkFixed tmp; @@ -121,7 +121,7 @@ public: FloatInterp() : INHERITED("float") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { SkFixed tmp; for (int i = 0; i < count; i += 4) { tmp = SkFloatToFixed(fx); dst[i + 0] = TILE(tmp, count); fx += dx; @@ -139,7 +139,7 @@ public: DoubleInterp() : INHERITED("double") {} protected: - void performTest(int16_t dst[], float fx, float dx, int count) SK_OVERRIDE { + void performTest(int16_t dst[], float fx, float dx, int count) override { double ffx = fx; double ddx = dx; SkFixed tmp; -- cgit v1.2.3