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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 16159b1f0655743fcec54469157d5cfe6a91b953..c9648e8bc8886e98d50a9aa74bb0fe2d7be2094c 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -350,43 +350,37 @@ typedef short int WXTYPE;
     #endif
 #endif
 
     #endif
 #endif
 

-#ifndef HAVE_TYPE_TRAITS
-    #if defined(__has_include) && __has_include(<type_traits>)
-        #define HAVE_TYPE_TRAITS
+#ifndef HAVE_TR1_TYPE_TRAITS
+    #if defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
+        #define HAVE_TR1_TYPE_TRAITS

     #endif
 #endif
 
     #endif
 #endif
 

-#ifndef HAVE_TR1_TYPE_TRAITS
-    #if defined(__has_include) && __has_include(<tr1/type_traits>)
-        #define HAVE_TR1_TYPE_TRAITS
-    #elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
+#if defined(__has_include)
+    #if !defined(HAVE_TYPE_TRAITS) && __has_include(<type_traits>)
+        #define HAVE_TYPE_TRAITS
+    #endif
+
+    #if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include(<tr1/type_traits>)

         #define HAVE_TR1_TYPE_TRAITS
     #endif
         #define HAVE_TR1_TYPE_TRAITS
     #endif

-#endif

 
 

-#ifndef HAVE_STD_UNORDERED_MAP
-    #if defined(__has_include) && __has_include(<unordered_map>)
+    #if !defined(HAVE_STD_UNORDERED_MAP) && __has_include(<unordered_map>)

         #define HAVE_STD_UNORDERED_MAP
     #endif
         #define HAVE_STD_UNORDERED_MAP
     #endif

-#endif

 
 

-#ifndef HAVE_TR1_UNORDERED_MAP
-    #if defined(__has_include) && __has_include(<tr1/unordered_map>)
+    #if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include(<tr1/unordered_map>)

         #define HAVE_TR1_UNORDERED_MAP
     #endif
         #define HAVE_TR1_UNORDERED_MAP
     #endif

-#endif

 
 

-#ifndef HAVE_STD_UNORDERED_SET
-    #if defined(__has_include) && __has_include(<unordered_set>)
+    #if !defined(HAVE_STD_UNORDERED_SET) && __has_include(<unordered_set>)

         #define HAVE_STD_UNORDERED_SET
     #endif
         #define HAVE_STD_UNORDERED_SET
     #endif

-#endif

 
 

-#ifndef HAVE_TR1_UNORDERED_SET
-    #if defined(__has_include) && __has_include(<tr1/unordered_set>)
+    #if !defined(HAVE_TR1_UNORDERED_SET) && __has_include(<tr1/unordered_set>)

         #define HAVE_TR1_UNORDERED_SET
     #endif
         #define HAVE_TR1_UNORDERED_SET
     #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 */