include/core/SkTypes.h - Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: include/core/SkTypes.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

Index: include/core/SkTypes.h

diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h

index 39923c59b758611abe7855e33c335bd30629692e..3f4bc2cf34c619ea8b14c5afd265658d0f47212c 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>

« no previous file with comments | « include/core/SkStream.h ('k') | include/core/SkWeakRefCnt.h » ('j') | no next file with comments »