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

Fix VC++ warnings about __has_include().

Browse Source 
The compiler warns about content after defined(__has_included), so avoid
the issue by putting these Clang tests inside one big #ifdef
__has_included block.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-07-09 17:29:02 +00:00
parent f92099657f
commit 50d2908480
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/wx/defs.h
View File

@@ -350,43 +350,37 @@ typedef short int WXTYPE;
#endif #endif
#endif #endif
#ifndef HAVE_TYPE_TRAITS #ifndef HAVE_TR1_TYPE_TRAITS
#if defined(__has_include) && __has_include(<type_traits>) #if defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
#define HAVE_TR1_TYPE_TRAITS
#endif
#endif
#if defined(__has_include)
#if !defined(HAVE_TYPE_TRAITS) && __has_include(<type_traits>)
#define HAVE_TYPE_TRAITS #define HAVE_TYPE_TRAITS
#endif #endif
#endif
#ifndef HAVE_TR1_TYPE_TRAITS #if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include(<tr1/type_traits>)
#if defined(__has_include) && __has_include(<tr1/type_traits>)
#define HAVE_TR1_TYPE_TRAITS
#elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
#define HAVE_TR1_TYPE_TRAITS #define HAVE_TR1_TYPE_TRAITS
#endif #endif
#endif
#ifndef HAVE_STD_UNORDERED_MAP #if !defined(HAVE_STD_UNORDERED_MAP) && __has_include(<unordered_map>)
#if defined(__has_include) && __has_include(<unordered_map>)
#define HAVE_STD_UNORDERED_MAP #define HAVE_STD_UNORDERED_MAP
#endif #endif
#endif
#ifndef HAVE_TR1_UNORDERED_MAP #if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include(<tr1/unordered_map>)
#if defined(__has_include) && __has_include(<tr1/unordered_map>)
#define HAVE_TR1_UNORDERED_MAP #define HAVE_TR1_UNORDERED_MAP
#endif #endif
#endif
#ifndef HAVE_STD_UNORDERED_SET #if !defined(HAVE_STD_UNORDERED_SET) && __has_include(<unordered_set>)
#if defined(__has_include) && __has_include(<unordered_set>)
#define HAVE_STD_UNORDERED_SET #define HAVE_STD_UNORDERED_SET
#endif #endif
#endif
#ifndef HAVE_TR1_UNORDERED_SET #if !defined(HAVE_TR1_UNORDERED_SET) && __has_include(<tr1/unordered_set>)
#if defined(__has_include) && __has_include(<tr1/unordered_set>)
#define HAVE_TR1_UNORDERED_SET #define HAVE_TR1_UNORDERED_SET
#endif #endif
#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 */