From: Václav Slavík <vslavik@fastmail.fm>
Date: Tue, 9 Jul 2013 15:47:13 +0000 (+0000)
Subject: Fix OS X compilation in C++11 mode with libc++.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3a07232f32b64d0a2b39a70dc1123806e5db4bb6?ds=sidebyside

Fix OS X compilation in C++11 mode with libc++.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/defs.h b/include/wx/defs.h
index e418ef41cd..b83a43bd7a 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -350,12 +350,45 @@ typedef short int WXTYPE;
     #endif
 #endif
 
+#ifndef HAVE_TYPE_TRAITS
+    #if defined(__has_include) && __has_include(<type_traits>)
+        #define HAVE_TYPE_TRAITS
+    #endif
+#endif
+
 #ifndef HAVE_TR1_TYPE_TRAITS
-    #if defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
+    #if defined(__has_include) && __has_include(<tr1/type_traits>)
+        #define HAVE_TR1_TYPE_TRAITS
+    #endif
+    #elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
         #define HAVE_TR1_TYPE_TRAITS
     #endif
 #endif
 
+#ifndef HAVE_STD_UNORDERED_MAP
+    #if defined(__has_include) && __has_include(<unordered_map>)
+        #define HAVE_STD_UNORDERED_MAP
+    #endif
+#endif
+
+#ifndef HAVE_TR1_UNORDERED_MAP
+    #if defined(__has_include) && __has_include(<tr1/unordered_map>)
+        #define HAVE_TR1_UNORDERED_MAP
+    #endif
+#endif
+
+#ifndef HAVE_STD_UNORDERED_SET
+    #if defined(__has_include) && __has_include(<unordered_set>)
+        #define HAVE_STD_UNORDERED_SET
+    #endif
+#endif
+
+#ifndef HAVE_TR1_UNORDERED_SET
+    #if defined(__has_include) && __has_include(<tr1/unordered_set>)
+        #define HAVE_TR1_UNORDERED_SET
+    #endif
+#endif
+
 /* provide replacement for C99 va_copy() if the compiler doesn't have it */
 
 /* could be already defined by configure or the user */