Changeset 117779 in webkit

Timestamp:

May 21, 2012 7:24:22 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Colliding isinf/isnan between C99 and C++11 with GCC >=4.6
​https://bugs.webkit.org/show_bug.cgi?id=59249

Patch by Allan Sandfeld Jensen <​allan.jensen@nokia.com> on 2012-05-21
Reviewed by Darin Adler.

Workaround the isinf and isnan conflict in GCC C++11.

• wtf/Compiler.h:
• wtf/MathExtras.h:

(std::wtf_isinf):
(std::wtf_isnan):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Compiler.h (modified) (2 diffs)
• wtf/MathExtras.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-05-21  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        Colliding isinf/isnan between C99 and C++11 with GCC >=4.6
+        https://bugs.webkit.org/show_bug.cgi?id=59249
+
+        Reviewed by Darin Adler.
+
+        Workaround the isinf and isnan conflict in GCC C++11.
+
+        * wtf/Compiler.h:
+        * wtf/MathExtras.h:
+        (std::wtf_isinf):
+        (std::wtf_isnan):
+
 2012-05-21  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WTF/wtf/Compiler.h

@@ -33 +33 @@
 #define COMPILER_SUPPORTS(WTF_COMPILER_FEATURE) (defined WTF_COMPILER_SUPPORTS_##WTF_COMPILER_FEATURE  && WTF_COMPILER_SUPPORTS_##WTF_COMPILER_FEATURE)
 
+/* COMPILER_QUIRK() - whether the compiler being used to build the project requires a given quirk. */
+#define COMPILER_QUIRK(WTF_COMPILER_QUIRK) (defined WTF_COMPILER_QUIRK_##WTF_COMPILER_QUIRK  && WTF_COMPILER_QUIRK_##WTF_COMPILER_QUIRK)
+
 /* ==== COMPILER() - the compiler being used to build the project ==== */
 
@@ -96 +99 @@
 #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))
-
-/* Specific compiler features */
-#if !COMPILER(CLANG) && GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define WTF_COMPILER_SUPPORTS_CXX_NULLPTR 1 
-#endif
-
 #else
 /* Define this for !GCC compilers, just so we can write things like GCC_VERSION_AT_LEAST(4, 1, 0). */
 #define GCC_VERSION_AT_LEAST(major, minor, patch) 0
+#endif
+
+/* Specific compiler features */
+#if COMPILER(GCC) && !COMPILER(CLANG)
+#if GCC_VERSION_AT_LEAST(4, 7, 0) && __cplusplus >= 201103L
+#define WTF_COMPILER_SUPPORTS_CXX_NULLPTR 1
+#define WTF_COMPILER_QUIRK_GCC11_GLOBAL_ISINF_ISNAN 1
+
+#elif GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)
+#define WTF_COMPILER_SUPPORTS_CXX_NULLPTR 1 
+#define WTF_COMPILER_QUIRK_GCC11_GLOBAL_ISINF_ISNAN 1
+#endif
+
 #endif
 

trunk/Source/WTF/wtf/MathExtras.h

@@ -280 +280 @@
 #if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(SOLARIS)
 using std::isfinite;
+#if !COMPILER_QUIRK(GCC11_GLOBAL_ISINF_ISNAN)
 using std::isinf;
 using std::isnan;
+#endif
 using std::signbit;
 #endif
+
+#if COMPILER_QUIRK(GCC11_GLOBAL_ISINF_ISNAN)
+// A workaround to avoid conflicting declarations of isinf and isnan when compiling with GCC in C++11 mode.
+namespace std {
+    constexpr bool wtf_isinf(float f) { return std::isinf(f); }
+    constexpr bool wtf_isinf(double d) { return std::isinf(d); }
+    constexpr bool wtf_isnan(float f) { return std::isnan(f); }
+    constexpr bool wtf_isnan(double d) { return std::isnan(d); }
+};
+
+using std::wtf_isinf;
+using std::wtf_isnan;
+
+#define isinf(x) wtf_isinf(x)
+#define isnan(x) wtf_isnan(x)
+#endif
+
 
 // decompose 'number' to its sign, exponent, and mantissa components.