Cleanup: More override fixes - another round.

bench/ScalarBench.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Benchmark.h"
 #include "SkFloatBits.h"
 #include "SkRandom.h"
@@ skipping 13 matching lines @@
 
     virtual void performTest() = 0;
 
 protected:
     virtual int mulLoopCount() const { return 1; }
 
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onDraw(const int loops, SkCanvas* canvas) {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         for (int i = 0; i < loops; i++) {
             this->performTest();
         }
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 // having unknown values in our arrays can throw off the timing a lot, perhaps
@@ skipping 49 matching lines @@
 
 class IsFiniteScalarBench : public ScalarBench {
 public:
     IsFiniteScalarBench() : INHERITED("isfinite") {
         SkRandom rand;
         for (size_t i = 0; i < ARRAY_N; ++i) {
             fArray[i] = rand.nextSScalar1();
         }
     }
 protected:
-    virtual int mulLoopCount() const { return 1; }
+    virtual int mulLoopCount() const SK_OVERRIDE { return 1; }
     virtual void performTest() SK_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
             // value as an int (even though we tell it that it is a float)
             sum += SkScalarIsFinite(-fArray[i]);
         }
         // we do this so the compiler won't optimize our loop away...
         this->doSomething(fArray, sum);
     }
@@ skipping 44 matching lines @@
 private:
     typedef Benchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new FloatComparisonBench(); )
 DEF_BENCH( return new ForcedIntComparisonBench(); )
 DEF_BENCH( return new RectBoundsBench(); )
 DEF_BENCH( return new IsFiniteScalarBench(); )