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

Unified Diff: sky/engine/wtf/Compiler.h

Issue 673403002: Remove compiler feature detection for = delete (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Don't remove #define for FINAL Created 6 years, 2 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 | « sky/engine/platform/heap/Heap.h ('k') | sky/engine/wtf/Noncopyable.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/wtf/Compiler.h
diff --git a/sky/engine/wtf/Compiler.h b/sky/engine/wtf/Compiler.h
index 403d0385bcd8a9852a7746e1f2e896dbf8fabd5a..ff35d100894309be4206a14eb08ee00c2c7b6826 100644
--- a/sky/engine/wtf/Compiler.h
+++ b/sky/engine/wtf/Compiler.h
@@ -51,13 +51,11 @@
check for both cxx_rvalue_references as well as the unrelated cxx_nonstatic_member_init feature which we know was added in 4.3 */
#define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES __has_extension(cxx_rvalue_references) && __has_extension(cxx_nonstatic_member_init)
-#define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS __has_extension(cxx_deleted_functions)
#define WTF_COMPILER_SUPPORTS_CXX_NULLPTR __has_feature(cxx_nullptr)
#define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS __has_feature(cxx_explicit_conversions)
#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 +77,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
@@ -108,9 +104,6 @@
#define WTF_COMPILER_SUPPORTS_CXX_STATIC_ASSERT 1
#define WTF_COMPILER_SUPPORTS_CXX_VARIADIC_TEMPLATES 1
#endif
-#if GCC_VERSION_AT_LEAST(4, 4, 0)
-#define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
-#endif
#if GCC_VERSION_AT_LEAST(4, 5, 0)
#define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1
#endif
@@ -119,9 +112,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) */
@@ -206,23 +196,8 @@
#define ALLOW_UNUSED
#endif
-/* override and FINAL */
-
-#if COMPILER_SUPPORTS(CXX_OVERRIDE_CONTROL)
-#define override override
+/* FIXME: Convert all instance of FINAL to final */
#define FINAL final
-#else
-#define override
-#define FINAL
-#endif
-
-/* WTF_DELETED_FUNCTION */
-
-#if COMPILER_SUPPORTS(CXX_DELETED_FUNCTIONS)
-#define WTF_DELETED_FUNCTION = delete
-#else
-#define WTF_DELETED_FUNCTION
-#endif
/* REFERENCED_FROM_ASM */
« no previous file with comments | « sky/engine/platform/heap/Heap.h ('k') | sky/engine/wtf/Noncopyable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698