Ticket #57751: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits_h

File patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits_h, 1.2 KB (added by devernay (Frédéric Devernay), 5 years ago)
Line 
1$OpenBSD$
2
3Disable __GLIBCXX__ code to prevent error from gcc 6:
4error: 'std::tr1' has not been declared
5
6Index: src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
7--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h.orig
8+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h
9@@ -24,7 +24,7 @@
10 
11 #include "Platform.h"
12 
13-#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
14+#if (0 && defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
15 #include <type_traits>
16 #endif
17 
18@@ -166,7 +166,7 @@ namespace WTF {
19         typedef T Type;
20     };
21 
22-#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
23+#if (0 && defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
24 
25     // GCC's libstdc++ 20070724 and later supports C++ TR1 type_traits in the std namespace.
26     // VC10 (VS2010) and later support C++ TR1 type_traits in the std::tr1 namespace.