Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: src/animator/SkMemberInfo.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/animator/SkMatrixParts.h ('k') | src/animator/SkPaintPart.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkMemberInfo.h
diff --git a/src/animator/SkMemberInfo.h b/src/animator/SkMemberInfo.h
index c0d9e2087afdd09a6a7bdb4d2701345dfeef3160..e07c32270d2ab65393bb7ffdf4a9dd35a0bda9c5 100644
--- a/src/animator/SkMemberInfo.h
+++ b/src/animator/SkMemberInfo.h
@@ -150,49 +150,49 @@ struct SkMemberInfo {
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
typedef Sk##_type BASE_CLASS
#define DECLARE_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
- SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
+ SkDisplayTypes getType() const override { return SkType_##_type; } \
typedef Sk##_type BASE_CLASS
#define DECLARE_DRAW_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
- SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
+ SkDisplayTypes getType() const override { return SkType_##_type; } \
typedef SkDraw##_type BASE_CLASS
#define DECLARE_DISPLAY_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
- SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; } \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
+ SkDisplayTypes getType() const override { return SkType_##_type; } \
typedef SkDisplay##_type BASE_CLASS
#define DECLARE_EMPTY_MEMBER_INFO(_type) \
public: \
- SkDisplayTypes getType() const SK_OVERRIDE { return SkType_##_type; }
+ SkDisplayTypes getType() const override { return SkType_##_type; }
#define DECLARE_EXTRAS_MEMBER_INFO(_type) \
public: \
static const SkMemberInfo fInfo[]; \
static const int fInfoCount; \
- const SkMemberInfo* getMember(int index) SK_OVERRIDE; \
- const SkMemberInfo* getMember(const char name[]) SK_OVERRIDE; \
+ const SkMemberInfo* getMember(int index) override; \
+ const SkMemberInfo* getMember(const char name[]) override; \
SkDisplayTypes fType; \
- SkDisplayTypes getType() const SK_OVERRIDE { return fType; } \
+ SkDisplayTypes getType() const override { return fType; } \
typedef _type BASE_CLASS
#define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \
« no previous file with comments | « src/animator/SkMatrixParts.h ('k') | src/animator/SkPaintPart.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698