Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Unix build using clang with g++ 4.8 headers.

Browse Source 
Don't override HAVE_TR1_TYPE_TRAITS detected by configure with
HAVE_TYPE_TRAITS detected by clang __has_include() as the latter is less
reliable and can return true even when the header is not actually usable, as
it happens with g++ 4.8 <type_traits> in non C++11 mode.

Closes #15915.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-02-22 22:39:43 +00:00
parent fe93941fb2
commit e0a255785f
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
include/wx/defs.h
View File

@@ -351,30 +351,37 @@ typedef short int WXTYPE;
#endif #endif
#if defined(__has_include) #if defined(__has_include)
#if !defined(HAVE_TYPE_TRAITS) && __has_include(<type_traits>) /*
#define HAVE_TYPE_TRAITS Notice that we trust our configure tests more than __has_include(),
notably the latter can return true even if the header exists but isn't
actually usable, as it happens with <type_traits> in non C++11 mode.
So if configure already detected at least one working alternative,
just use it.
*/
#if !defined(HAVE_TYPE_TRAITS) && !defined(HAVE_TR1_TYPE_TRAITS)
#if __has_include(<type_traits>)
#define HAVE_TYPE_TRAITS
#elif __has_include(<tr1/type_traits>)
#define HAVE_TR1_TYPE_TRAITS
#endif
#endif #endif
#if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include(<tr1/type_traits>) #if !defined(HAVE_STD_UNORDERED_MAP) && !defined(HAVE_TR1_UNORDERED_MAP)
#define HAVE_TR1_TYPE_TRAITS #if __has_include(<unordered_map>)
#define HAVE_STD_UNORDERED_MAP
#elif __has_include(<tr1/unordered_map>)
#define HAVE_TR1_UNORDERED_MAP
#endif
#endif #endif
#if !defined(HAVE_STD_UNORDERED_MAP) && __has_include(<unordered_map>) #if !defined(HAVE_STD_UNORDERED_SET) && !defined(HAVE_TR1_UNORDERED_SET)
#define HAVE_STD_UNORDERED_MAP #if __has_include(<unordered_set>)
#define HAVE_STD_UNORDERED_SET
#elif __has_include(<tr1/unordered_set>)
#define HAVE_TR1_UNORDERED_SET
#endif
#endif #endif
#endif /* defined(__has_include) */
#if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include(<tr1/unordered_map>)
#define HAVE_TR1_UNORDERED_MAP
#endif
#if !defined(HAVE_STD_UNORDERED_SET) && __has_include(<unordered_set>)
#define HAVE_STD_UNORDERED_SET
#endif
#if !defined(HAVE_TR1_UNORDERED_SET) && __has_include(<tr1/unordered_set>)
#define HAVE_TR1_UNORDERED_SET
#endif
#endif // defined(__has_include)
/* provide replacement for C99 va_copy() if the compiler doesn't have it */ /* provide replacement for C99 va_copy() if the compiler doesn't have it */