X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df5168c427b51f1ab2b3200a5c8f7626b3d24aae..74e0e33a85ab0514dd1c0a750d694da1f3a28f08:/include/wx/afterstd.h

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index 313c2257a2..107d594eff 100644
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/afterstd.h
+// Name:        wx/afterstd.h
 // Purpose:     #include after STL headers
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -13,7 +13,33 @@
     See the comments in beforestd.h.
  */
 
-#ifdef _MSC_VER
-#   pragma warning(pop)
+#if defined(__WXMSW__)
+    #include "wx/msw/winundef.h"
 #endif
 
+// undo what we did in wx/beforestd.h
+#if defined(__VISUALC__) && __VISUALC__ <= 1201
+    // MSVC 5 does not have this
+    #if _MSC_VER > 1100
+        #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)
+
+        // C++ language change: to explicitly specialize class template
+        // 'identifier' use the following syntax
+        #pragma warning(default:4663)
+    #endif
+#endif
+
+// see beforestd.h for explanation
+#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
+    #pragma GCC visibility pop
+#endif