X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c11806499166993dffcbb99139d5b248a2c6c82..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/afterstd.h

diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index b99a08402c..d57412d7e2 100644
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -16,8 +16,9 @@
 #if defined(__WXMSW__)
     #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
@@ -32,6 +33,9 @@
         // '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 +46,7 @@
     #endif
 #endif
 
+// see beforestd.h for explanation
+#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
+    #pragma GCC visibility pop
+#endif