aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench/MemsetBench.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-03 17:29:58 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-06-03 17:29:58 +0000
commit59ce1377b1252969bc9accdcfb42ef573c8241b6 (patch)
tree54268b363011eb651ebb9269ebebb0b6812a2c9a /bench/MemsetBench.cpp
parent78aa76c02eeb0b1519fb59429c1e8f9d83a0d6c5 (diff)
Fix Win7 warning-as-error complaint
git-svn-id: http://skia.googlecode.com/svn/trunk@9411 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench/MemsetBench.cpp')
-rw-r--r--bench/MemsetBench.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/bench/MemsetBench.cpp b/bench/MemsetBench.cpp
index 29370818a3..660c8c3d02 100644
--- a/bench/MemsetBench.cpp
+++ b/bench/MemsetBench.cpp
@@ -62,7 +62,7 @@ public:
: INHERITED(param, MEMSET32, minSize, maxSize) {}
protected:
- virtual inline void performTest() SK_OVERRIDE {
+ virtual void performTest() SK_OVERRIDE {
for(size_t j = fMinSize; j < fMaxSize; ++j){
sk_memset32(kBuffer, VALUE32, j);
sk_memset32(kBuffer + 1, VALUE32, j);
@@ -81,7 +81,7 @@ public:
: INHERITED(param, MEMSET16, minSize, maxSize) {}
protected:
- virtual inline void performTest() SK_OVERRIDE {
+ virtual void performTest() SK_OVERRIDE {
for(size_t j = fMinSize; j < fMaxSize; ++j){
sk_memset16(kBuffer, VALUE16, j);
sk_memset16(kBuffer + 1, VALUE16, j);