aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/FrontBufferedStreamTest.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-25 18:17:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 18:17:32 -0700
commit36352bf5e38f45a70ee4f4fc132a38048d38206d (patch)
tree24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /tests/FrontBufferedStreamTest.cpp
parent02fd592c8d190058652bb715fb34feb7a72992e5 (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/FrontBufferedStreamTest.cpp')
-rw-r--r--tests/FrontBufferedStreamTest.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp
index 69dade04b9..f3ef47db59 100644
--- a/tests/FrontBufferedStreamTest.cpp
+++ b/tests/FrontBufferedStreamTest.cpp
@@ -131,7 +131,7 @@ public:
: INHERITED(data, size, ownMemory)
, fIsAtEnd(false) {}
- size_t read(void* dst, size_t requested) SK_OVERRIDE {
+ size_t read(void* dst, size_t requested) override {
size_t bytesRead = this->INHERITED::read(dst, requested);
if (bytesRead < requested) {
fIsAtEnd = true;
@@ -139,7 +139,7 @@ public:
return bytesRead;
}
- bool isAtEnd() const SK_OVERRIDE {
+ bool isAtEnd() const override {
return fIsAtEnd;
}
@@ -175,19 +175,19 @@ public:
, fHasPosition(hasPosition)
{}
- bool hasLength() const SK_OVERRIDE {
+ bool hasLength() const override {
return fHasLength;
}
- bool hasPosition() const SK_OVERRIDE {
+ bool hasPosition() const override {
return fHasPosition;
}
- size_t read(void*, size_t) SK_OVERRIDE {
+ size_t read(void*, size_t) override {
return 0;
}
- bool isAtEnd() const SK_OVERRIDE {
+ bool isAtEnd() const override {
return true;
}
@@ -264,7 +264,7 @@ public:
: fAtEnd(false)
, fReadAfterEnd(false)
{}
- size_t read(void* buffer, size_t size) SK_OVERRIDE {
+ size_t read(void* buffer, size_t size) override {
if (fAtEnd) {
fReadAfterEnd = true;
} else {
@@ -273,7 +273,7 @@ public:
return 0;
}
- bool isAtEnd() const SK_OVERRIDE {
+ bool isAtEnd() const override {
return fAtEnd;
}