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

Unified Diff: include/core/SkPostConfig.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 | « include/core/SkPathEffect.h ('k') | include/core/SkShader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPostConfig.h
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h
index d08f68a1d91c916e5df8249ebd13babc245f0405..22427d201664e993e79a30d473d4b183694dd0a4 100644
--- a/include/core/SkPostConfig.h
+++ b/include/core/SkPostConfig.h
@@ -284,32 +284,6 @@
//////////////////////////////////////////////////////////////////////
-#ifndef SK_OVERRIDE
-# if defined(_MSC_VER)
-# define SK_OVERRIDE override
-# elif defined(__clang__)
- // Using __attribute__((override)) on clang does not appear to always work.
- // Clang defaults to C++03 and warns about using override. Squelch that. Intentionally no
- // push/pop here so all users of SK_OVERRIDE ignore the warning too. This is like passing
- // -Wno-c++11-extensions, except that GCC won't die (because it won't see this pragma).
-# pragma clang diagnostic ignored "-Wc++11-extensions"
-#
-# if __has_feature(cxx_override_control)
-# define SK_OVERRIDE override
-# elif defined(__has_extension) && __has_extension(cxx_override_control)
-# define SK_OVERRIDE override
-# endif
- // if GCC >= 4.7
-# elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
-# define SK_OVERRIDE override
-# endif
-# ifndef SK_OVERRIDE
-# define SK_OVERRIDE
-# endif
-#endif
-
-//////////////////////////////////////////////////////////////////////
-
#if !defined(SK_UNUSED)
# define SK_UNUSED SK_ATTRIBUTE(unused)
#endif
« no previous file with comments | « include/core/SkPathEffect.h ('k') | include/core/SkShader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698