Chromium Code Reviews| Index: Source/wtf/Compiler.h |
| diff --git a/Source/wtf/Compiler.h b/Source/wtf/Compiler.h |
| index 67050694ebb54804881bf0f0150774c80da3941b..7b950743a0e5a8366f61265c8b832bb11b3df5c9 100644 |
| --- a/Source/wtf/Compiler.h |
| +++ b/Source/wtf/Compiler.h |
| @@ -57,7 +57,6 @@ |
| #define WTF_COMPILER_SUPPORTS_BLOCKS __has_feature(blocks) |
| #define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT __has_extension(c_static_assert) |
| #define WTF_COMPILER_SUPPORTS_CXX_STATIC_ASSERT __has_extension(cxx_static_assert) |
| -#define WTF_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL __has_extension(cxx_override_control) |
| #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_extension(has_trivial_destructor) |
| #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_extension(cxx_strong_enums) |
| @@ -79,8 +78,6 @@ |
| #if COMPILER(CLANG) |
| /* Keep strong enums turned off when building with clang-cl: We cannot yet build all of Blink without fallback to cl.exe, and strong enums are exposed at ABI boundaries. */ |
| #undef WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS |
| -#else |
| -#define WTF_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL 1 |
| #endif |
| #endif |
| @@ -119,9 +116,6 @@ |
| /* Strong enums should work from gcc 4.4, but doesn't seem to support some operators */ |
| #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS 1 |
| #endif |
| -#if GCC_VERSION_AT_LEAST(4, 7, 0) |
| -#define WTF_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL 1 |
| -#endif |
| #endif /* defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(__cplusplus) && __cplusplus >= 201103L) */ |
| #endif /* COMPILER(GCC) */ |
| @@ -208,13 +202,8 @@ |
| /* OVERRIDE and FINAL */ |
| -#if COMPILER_SUPPORTS(CXX_OVERRIDE_CONTROL) |
| #define OVERRIDE override |
| #define FINAL final |
| -#else |
| -#define OVERRIDE |
| -#define FINAL |
|
Nico
2014/09/25 19:32:38
nit: This seems kind of independent of the mechani
|
| -#endif |
| /* WTF_DELETED_FUNCTION */ |