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

Unified Diff: include/gpu/GrConfig.h

Issue 1777213003: Remove version checks for _MSC_VER < 1800 (msvs2013). (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 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/gpu/GrConfig.h
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h
index bb653b6a7d46f4e01dd45c7faf1fc341d403be0a..8e0efbd4725aeac0402a4273b972ff0945e8e309 100644
--- a/include/gpu/GrConfig.h
+++ b/include/gpu/GrConfig.h
@@ -106,7 +106,7 @@ typedef unsigned __int64 uint64_t;
* particular compiler.
* To insert compiler warnings use "#pragma message GR_WARN(<string>)"
*/
-#if defined(_MSC_VER) && _MSC_VER
+#if defined(_MSC_VER)
#define GR_WARN(MSG) (GR_FILE_AND_LINE_STR "WARNING: " MSG)
#else//__GNUC__ - may need other defines for different compilers
#define GR_WARN(MSG) ("WARNING: " MSG)
@@ -171,19 +171,7 @@ typedef unsigned __int64 uint64_t;
* it may print the message in the compiler log. Obviously, the condition must
* be evaluatable at compile time.
*/
-// VS 2010 and GCC compiled with c++0x or gnu++0x support the new
-// static_assert.
-#if !defined(GR_STATIC_ASSERT)
- #if (defined(_MSC_VER) && _MSC_VER >= 1600) || (defined(__GXX_EXPERIMENTAL_CXX0X__) && __GXX_EXPERIMENTAL_CXX0X__)
- #define GR_STATIC_ASSERT(CONDITION) static_assert(CONDITION, "bug")
- #else
- template <bool> class GR_STATIC_ASSERT_FAILURE;
- template <> class GR_STATIC_ASSERT_FAILURE<true> {};
- #define GR_STATIC_ASSERT(CONDITION) \
- enum {GR_CONCAT(X,__LINE__) = \
- sizeof(GR_STATIC_ASSERT_FAILURE<CONDITION>)}
- #endif
-#endif
+#define GR_STATIC_ASSERT(CONDITION) static_assert(CONDITION, "bug")
/**
* Set to 1 to enable pixel local storage path rendering on supported devices.

Powered by Google App Engine
This is Rietveld 408576698