Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / wtf / Compiler.h

diff --git a/src/third_party/WebKit/Source/wtf/Compiler.h b/src/third_party/WebKit/Source/wtf/Compiler.h
index 82004a5..9b03314 100644 (file)
--- a/src/third_party/WebKit/Source/wtf/Compiler.h
+++ b/src/third_party/WebKit/Source/wtf/Compiler.h
@@ -44,22 +44,13 @@
 #define CLANG_PRAGMA(PRAGMA) _Pragma(PRAGMA)
 
 /* Specific compiler features */
-#define WTF_COMPILER_SUPPORTS_CXX_VARIADIC_TEMPLATES __has_extension(cxx_variadic_templates)
-
-/* There is a bug in clang that comes with Xcode 4.2 where AtomicStrings can't be implicitly converted to Strings
-   in the presence of move constructors and/or move assignment operators. This bug has been fixed in Xcode 4.3 clang, so we
-   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)
 
 #endif
 
@@ -70,20 +61,6 @@
 /* COMPILER(MSVC) - Microsoft Visual C++ */
 #if defined(_MSC_VER)
 #define WTF_COMPILER_MSVC 1
-
-/* Specific compiler features */
-#if !COMPILER(CLANG) && _MSC_VER >= 1600
-#define WTF_COMPILER_SUPPORTS_CXX_NULLPTR 1
-#endif
-
-#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
-#define WTF_COMPILER_QUIRK_FINAL_IS_CALLED_SEALED 1
-#endif
-
 #endif
 
 /* COMPILER(GCC) - GNU Compiler Collection */
@@ -105,9 +82,7 @@
 #if defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(__cplusplus) && __cplusplus >= 201103L)
 /* C++11 support */
 #if GCC_VERSION_AT_LEAST(4, 3, 0)
-#define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1
 #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
@@ -115,14 +90,6 @@
 #if GCC_VERSION_AT_LEAST(4, 5, 0)
 #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1
 #endif
-#if GCC_VERSION_AT_LEAST(4, 6, 0)
-#define WTF_COMPILER_SUPPORTS_CXX_NULLPTR 1
-/* 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) */
 
@@ -147,6 +114,8 @@
 #ifndef NEVER_INLINE
 #if COMPILER(GCC)
 #define NEVER_INLINE __attribute__((__noinline__))
+#elif COMPILER(MSVC)
+#define NEVER_INLINE __declspec(noinline)
 #else
 #define NEVER_INLINE
 #endif
@@ -177,7 +146,6 @@
 
 /* NO_RETURN */
 
-
 #ifndef NO_RETURN
 #if COMPILER(GCC)
 #define NO_RETURN __attribute((__noreturn__))
@@ -189,17 +157,6 @@
 #endif
 
 
-/* NO_RETURN_WITH_VALUE */
-
-#ifndef NO_RETURN_WITH_VALUE
-#if !COMPILER(MSVC)
-#define NO_RETURN_WITH_VALUE NO_RETURN
-#else
-#define NO_RETURN_WITH_VALUE
-#endif
-#endif
-
-
 /* WARN_UNUSED_RETURN */
 
 #if COMPILER(GCC)
@@ -208,29 +165,11 @@
 #define WARN_UNUSED_RETURN
 #endif
 
-/* ALLOW_UNUSED */
 
-#if COMPILER(GCC)
-#define ALLOW_UNUSED __attribute__((unused))
-#else
-#define ALLOW_UNUSED
-#endif
+/* ALLOW_UNUSED_LOCAL */
 
-/* OVERRIDE and FINAL */
+#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
 
-#if COMPILER_SUPPORTS(CXX_OVERRIDE_CONTROL)
-#define OVERRIDE override
-
-#if COMPILER_QUIRK(FINAL_IS_CALLED_SEALED)
-#define FINAL sealed
-#else
-#define FINAL final
-#endif
-
-#else
-#define OVERRIDE
-#define FINAL
-#endif
 
 /* WTF_DELETED_FUNCTION */
 
@@ -240,6 +179,7 @@
 #define WTF_DELETED_FUNCTION
 #endif
 
+
 /* REFERENCED_FROM_ASM */
 
 #ifndef REFERENCED_FROM_ASM
@@ -250,6 +190,7 @@
 #endif
 #endif
 
+
 /* OBJC_CLASS */
 
 #ifndef OBJC_CLASS
@@ -260,6 +201,7 @@
 #endif
 #endif
 
+
 /* WTF_PRETTY_FUNCTION */
 
 #if COMPILER(GCC)
@@ -267,7 +209,7 @@
 #define WTF_PRETTY_FUNCTION __PRETTY_FUNCTION__
 #elif COMPILER(MSVC)
 #define WTF_COMPILER_SUPPORTS_PRETTY_FUNCTION 1
-#define WTF_PRETTY_FUNCTION __FUNCDNAME__
+#define WTF_PRETTY_FUNCTION __FUNCSIG__
 #else
 #define WTF_PRETTY_FUNCTION __FUNCTION__
 #endif