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/RTreeBench.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bench/RTreeBench.cpp') diff --git a/bench/RTreeBench.cpp b/bench/RTreeBench.cpp index cdbdf35e01..6f76bd19bd 100644 --- a/bench/RTreeBench.cpp +++ b/bench/RTreeBench.cpp @@ -26,15 +26,15 @@ public: fName.printf("rtree_%s_build", name); } - 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 fName.c_str(); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom rand; SkAutoTMalloc rects(NUM_BUILD_RECTS); for (int i = 0; i < NUM_BUILD_RECTS; ++i) { @@ -60,14 +60,14 @@ public: fName.printf("rtree_%s_query", name); } - 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 fName.c_str(); } - void onPreDraw() SK_OVERRIDE { + void onPreDraw() override { SkRandom rand; SkAutoTMalloc rects(NUM_QUERY_RECTS); for (int i = 0; i < NUM_QUERY_RECTS; ++i) { @@ -76,7 +76,7 @@ protected: fTree.insert(rects.get(), NUM_QUERY_RECTS); } - void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { + void onDraw(const int loops, SkCanvas* canvas) override { SkRandom rand; for (int i = 0; i < loops; ++i) { SkTDArray hits; -- cgit v1.2.3