projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use a floating point value as a boolean flag; gcc4 (correctly) complains when...
[wxWidgets.git]
/
include
/
wx
/
afterstd.h
diff --git
a/include/wx/afterstd.h
b/include/wx/afterstd.h
index b99a08402c895321e0ce44755284cdc85d3cbbe7..5d3858cae8dd5b0018672852bdab6191d08844c8 100644
(file)
--- a/
include/wx/afterstd.h
+++ b/
include/wx/afterstd.h
@@
-16,8
+16,9
@@
#if defined(__WXMSW__)
#include "wx/msw/winundef.h"
#endif
#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
// 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