diff options
Diffstat (limited to 'include/core/SkTypes.h')
| -rw-r--r-- | include/core/SkTypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 39923c59b7..3f4bc2cf34 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -73,7 +73,7 @@ static inline void sk_bzero(void* buffer, size_t size) { /////////////////////////////////////////////////////////////////////////////// -#ifdef SK_OVERRIDE_GLOBAL_NEW +#ifdef override_GLOBAL_NEW #include <new> inline void* operator new(size_t size) { @@ -138,7 +138,7 @@ inline void operator delete(void* p) { #define SK_TO_STRING_NONVIRT() void toString(SkString* str) const; #define SK_TO_STRING_VIRT() virtual void toString(SkString* str) const; #define SK_TO_STRING_PUREVIRT() virtual void toString(SkString* str) const = 0; - #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const SK_OVERRIDE; + #define SK_TO_STRING_OVERRIDE() void toString(SkString* str) const override; #endif template <bool> |