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/ScalarBench.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'bench/ScalarBench.cpp') diff --git a/bench/ScalarBench.cpp b/bench/ScalarBench.cpp index f1a9b9adee..2c59fa5a32 100644 --- a/bench/ScalarBench.cpp +++ b/bench/ScalarBench.cpp @@ -18,7 +18,7 @@ public: fName.printf("scalar_%s", name); } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } @@ -27,11 +27,11 @@ public: protected: virtual int mulLoopCount() const { return 1; } - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { for (int i = 0; i < loops; i++) { this->performTest(); } @@ -101,8 +101,8 @@ public: } } protected: - int mulLoopCount() const SK_OVERRIDE { return 1; } - void performTest() SK_OVERRIDE { + int mulLoopCount() const override { return 1; } + void performTest() override { int sum = 0; for (size_t i = 0; i < ARRAY_N; ++i) { // We pass -fArray[i], so the compiler can't cheat and treat the @@ -140,16 +140,16 @@ public: } } - bool isSuitableFor(Backend backend) SK_OVERRIDE { + bool isSuitableFor(Backend backend) override { return backend == kNonRendering_Backend; } protected: - const char* onGetName() SK_OVERRIDE { + const char* onGetName() override { return "rect_bounds"; } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRect r; for (int i = 0; i < loops; ++i) { for (int i = 0; i < 1000; ++i) { -- cgit v1.2.3