AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable warning for eVC 4 (_MSC_VER == 1201) as well

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-06-19 23:49:27 +00:00
parent 0cdd4e199e
commit ffbc1990d1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/afterstd.h
View File

@ -16,8 +16,9 @@
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif #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 // MSVC 5 does not have this
#if _MSC_VER > 1100 #if _MSC_VER > 1100
// don't restore this one for VC6, it gives it in each try/catch which is a // don't restore this one for VC6, it gives it in each try/catch which is a

5
include/wx/beforestd.h
View File

@ -20,8 +20,9 @@
it can be included several times. it can be included several times.
*/ */
// VC 7.x isn't as bad as VC6 and doesn't give these warnings // VC 7.x isn't as bad as VC6 and doesn't give these warnings but eVC (which
#if defined(__VISUALC__) && __VISUALC__ <= 1200 // defines _MSC_VER as 1201) does need to be included as it's VC6-like
#if defined(__VISUALC__) && __VISUALC__ <= 1201
// MSVC 5 does not have this // MSVC 5 does not have this
#if __VISUALC__ > 1100 #if __VISUALC__ > 1100
// we have to disable (and reenable in afterstd.h) this one because, // we have to disable (and reenable in afterstd.h) this one because,