X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0545fc014a04c94fc0c41cfb95a77676246b492f..e91e1e3d5cab263883c1cee1689c898b8f7c4ecd:/include/wx/afterstd.h?ds=sidebyside

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index 6fdbb315b3..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,7 +12,7 @@
     See the comments in beforestd.h.
  */
 
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
     #include "wx/msw/winundef.h"
 #endif
 
@@ -21,13 +20,6 @@
 #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
@@ -46,3 +38,7 @@
     #endif
 #endif
 
+// see beforestd.h for explanation
+#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
+    #pragma GCC visibility pop
+#endif