diff options
author | mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /tests/BitmapHeapTest.cpp | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) |
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
Diffstat (limited to 'tests/BitmapHeapTest.cpp')
-rw-r--r-- | tests/BitmapHeapTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/BitmapHeapTest.cpp b/tests/BitmapHeapTest.cpp index 21ce2f39e8..eb86283618 100644 --- a/tests/BitmapHeapTest.cpp +++ b/tests/BitmapHeapTest.cpp @@ -18,11 +18,11 @@ struct SimpleFlatController : public SkFlatController { SimpleFlatController() : SkFlatController() {} ~SimpleFlatController() { fAllocations.freeAll(); } - void* allocThrow(size_t bytes) SK_OVERRIDE { + void* allocThrow(size_t bytes) override { fAllocations.push(sk_malloc_throw(bytes)); return fAllocations.top(); } - void unalloc(void*) SK_OVERRIDE { } + void unalloc(void*) override { } void setBitmapStorage(SkBitmapHeap* h) { this->setBitmapHeap(h); } private: SkTDArray<void*> fAllocations; |