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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-07-09 15:47:13 +00:00
parent f256de1125
commit 3a07232f32
1 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/wx/defs.h
View File

@@ -350,10 +350,43 @@ 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 */