Skip to content
Permalink
Browse files
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:

Canonical link: https://commits.webkit.org/34410@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@42356 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Xan Lopez committed Apr 9, 2009
1 parent efde10c commit f1f6ed3d0bcb2de14f741d1ab675236f2a09d97d
Showing 2 changed files with 12 additions and 2 deletions.
@@ -1,3 +1,13 @@
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>

Reviewed by Adam Roben.
@@ -24,7 +24,7 @@

#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

@@ -132,7 +132,7 @@ namespace WTF {
typedef T Type;
};

#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.
// VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.

0 comments on commit f1f6ed3

Please sign in to comment.