diff options
| author |  bungeman <bungeman@google.com> | 2016-03-10 11:14:40 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-10 11:14:40 -0800 |
| commit | d7dc76f7e99309cbd09a5420c22e55b951067deb (patch) | |
| tree | ca291b2cdfd909c38bdc9befe017e959ec0cef2b /include/gpu/GrConfig.h | |
| parent | cf371bb41b4a0591347a076ce7d83336d4bbc6fb (diff) | |
Remove version checks for _MSC_VER < 1800 (msvs2013).
We already actively do not support older versions of the vc++
compiler and runtime, so don't check for them anymore.
TBR=reed
No API changes.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1777213003
Review URL: https://codereview.chromium.org/1777213003
Diffstat (limited to 'include/gpu/GrConfig.h')
| -rw-r--r-- | include/gpu/GrConfig.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index bb653b6a7d..8e0efbd472 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. |