From bc5b91cb7c813eb94fb237a49e6dda358ebbdd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 25 Feb 2014 17:54:32 +0000 Subject: [PATCH] Fix compilation with Xcode projects (type_traits). The changes to type_traits headers detection with Clang broke Clang use with the Xcode projects. Fix this by not setting HAVE_* macros in config_xcode.h for Clang and letting defs.h detect the features. See #15915. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/config_xcode.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 510eb9f0b4..31f726e8cd 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -28,10 +28,12 @@ #define HAVE_STD_WSTRING 1 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 #if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 2 ) -#define HAVE_TR1_UNORDERED_MAP 1 -#define HAVE_TR1_UNORDERED_SET 1 -#define HAVE_TR1_TYPE_TRAITS 1 -#define HAVE_GCC_ATOMIC_BUILTINS 1 + #if !defined(__has_include) + #define HAVE_TR1_UNORDERED_MAP 1 + #define HAVE_TR1_UNORDERED_SET 1 + #define HAVE_TR1_TYPE_TRAITS 1 + #endif + #define HAVE_GCC_ATOMIC_BUILTINS 1 #endif #endif #define HAVE_VISIBILITY 1