aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/images/SkImageDecoder_libico.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 /src/images/SkImageDecoder_libico.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 'src/images/SkImageDecoder_libico.cpp')
-rw-r--r--src/images/SkImageDecoder_libico.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/images/SkImageDecoder_libico.cpp b/src/images/SkImageDecoder_libico.cpp
index 1fafd528e5..b9b3fba7bc 100644
--- a/src/images/SkImageDecoder_libico.cpp
+++ b/src/images/SkImageDecoder_libico.cpp
@@ -15,12 +15,12 @@ class SkICOImageDecoder : public SkImageDecoder {
public:
SkICOImageDecoder();
- Format getFormat() const SK_OVERRIDE {
+ Format getFormat() const override {
return kICO_Format;
}
protected:
- Result onDecode(SkStream* stream, SkBitmap* bm, Mode) SK_OVERRIDE;
+ Result onDecode(SkStream* stream, SkBitmap* bm, Mode) override;
private:
typedef SkImageDecoder INHERITED;