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) \ |