X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00ba414f7f79f8842d25c8b47cb091e20487b819..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/afterstd.h

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index e4967e0a78..16075fe5d7 100644
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -1,10 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/afterstd.h
+// Name:        wx/afterstd.h
 // Purpose:     #include after STL headers
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03
-// RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -13,25 +12,22 @@
     See the comments in beforestd.h.
  */
 
-#if defined(__WXMSW__) && defined(__MINGW32__)
+#if defined(__WINDOWS__)
     #include "wx/msw/winundef.h"
 #endif
-// VC 7.x isn't as bad as VC6 and doesn't give these warnings
-#if defined(__VISUALC__) && __VISUALC__ <= 1200
+
+// undo what we did in wx/beforestd.h
+#if defined(__VISUALC__) && __VISUALC__ <= 1201
     // MSVC 5 does not have this
     #if _MSC_VER > 1100
-        // don't restore this one for VC6, it gives it in each try/catch which is a
-        // bit annoying to say the least
-        #if _MSC_VER >= 0x1300
-            // unreachable code
-            #pragma warning(default:4702)
-        #endif // VC++ >= 7
-
         #pragma warning(pop)
     #else
         // 'expression' : signed/unsigned mismatch
         #pragma warning(default:4018)
 
+        // 'identifier' : unreferenced formal parameter
+        #pragma warning(default:4100)
+
         // 'conversion' : conversion from 'type1' to 'type2',
         // possible loss of data
         #pragma warning(default:4244)
@@ -42,3 +38,7 @@
     #endif
 #endif
 
+// see beforestd.h for explanation
+#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
+    #pragma GCC visibility pop
+#endif