Changeset 42356 in webkit

Timestamp:

Apr 9, 2009 5:29:42 AM (15 years ago)

Author:

xan@webkit.org

Message:

2009-04-09 Xan Lopez <​xlopez@igalia.com>

Unreviewed build fix.

Checking for GLIBCXX being bigger than some date is not enough
to get std::tr1, C++0x has to be in use too. Add another check for
GXX_EXPERIMENTAL_CXX0X.

• wtf/TypeTraits.h:

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-04-09  Xan Lopez  <xlopez@igalia.com>
+
+        Unreviewed build fix.
+
+        Checking for __GLIBCXX__ being bigger than some date is not enough
+        to get std::tr1, C++0x has to be in use too. Add another check for
+        __GXX_EXPERIMENTAL_CXX0X__.
+
+        * wtf/TypeTraits.h:
+
 2009-04-08  Oliver Hunt  <oliver@apple.com>
 

trunk/JavaScriptCore/wtf/TypeTraits.h

@@ -25 +25 @@
 #include "Platform.h"
 
-#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
+#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
 #include <type_traits>
 #endif
@@ -133 +133 @@
     };
 
-#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
+#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
 
     // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.