From 50d2908480c16f7a15e121819e8401903cb16f43 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 9 Jul 2013 17:29:02 +0000 Subject: [PATCH] Fix VC++ warnings about __has_include(). 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 --- include/wx/defs.h | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 16159b1f06..c9648e8bc8 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -350,43 +350,37 @@ typedef short int WXTYPE; #endif #endif -#ifndef HAVE_TYPE_TRAITS - #if defined(__has_include) && __has_include() - #define HAVE_TYPE_TRAITS +#ifndef HAVE_TR1_TYPE_TRAITS + #if defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729) + #define HAVE_TR1_TYPE_TRAITS #endif #endif -#ifndef HAVE_TR1_TYPE_TRAITS - #if defined(__has_include) && __has_include() - #define HAVE_TR1_TYPE_TRAITS - #elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729) +#if defined(__has_include) + #if !defined(HAVE_TYPE_TRAITS) && __has_include() + #define HAVE_TYPE_TRAITS + #endif + + #if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include() #define HAVE_TR1_TYPE_TRAITS #endif -#endif -#ifndef HAVE_STD_UNORDERED_MAP - #if defined(__has_include) && __has_include() + #if !defined(HAVE_STD_UNORDERED_MAP) && __has_include() #define HAVE_STD_UNORDERED_MAP #endif -#endif -#ifndef HAVE_TR1_UNORDERED_MAP - #if defined(__has_include) && __has_include() + #if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include() #define HAVE_TR1_UNORDERED_MAP #endif -#endif -#ifndef HAVE_STD_UNORDERED_SET - #if defined(__has_include) && __has_include() + #if !defined(HAVE_STD_UNORDERED_SET) && __has_include() #define HAVE_STD_UNORDERED_SET #endif -#endif -#ifndef HAVE_TR1_UNORDERED_SET - #if defined(__has_include) && __has_include() + #if !defined(HAVE_TR1_UNORDERED_SET) && __has_include() #define HAVE_TR1_UNORDERED_SET #endif -#endif +#endif // defined(__has_include) /* provide replacement for C99 va_copy() if the compiler doesn't have it */ -- 2.50.0