Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

force wxUSE_IOSTREAMH to 0 with VC 7.1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-05-27 22:04:50 +00:00
parent 6c33b24c53
commit eb382f3e5e
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/setup0.h
View File

@@ -906,7 +906,9 @@
#define REMOVE_UNUSED_ARG 1 #define REMOVE_UNUSED_ARG 1
// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix // VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
// them. Set to 1 for <iostream.h>, 0 for <iostream> // them. Set to 1 for <iostream.h>, 0 for <iostream>. Note that VC++ 7.1
// and later doesn't support wxUSE_IOSTREAMH == 1 and so <iostream> will be
// used anyhow.
// //
// Default is 1. // Default is 1.
// //

13
include/wx/platform.h
View File

@@ -85,6 +85,15 @@
/* check the consistency of the settings in setup.h */ /* check the consistency of the settings in setup.h */
#include "wx/chkconf.h" #include "wx/chkconf.h"
/*
some compilers don't support iostream.h any longer, so override the users
setting here in such case.
*/
#if defined(_MSC_VER) && (_MSC_VER >= 1310)
#undef wxUSE_IOSTREAMH
#define wxUSE_IOSTREAMH 0
#endif /* compilers not supporting iostream.h */
/* /*
old C++ headers (like <iostream.h>) declare classes in the global namespace old C++ headers (like <iostream.h>) declare classes in the global namespace
while the new, standard ones (like <iostream>) do it in std:: namespace while the new, standard ones (like <iostream>) do it in std:: namespace
@@ -93,9 +102,9 @@
either case either case
*/ */
#if !wxUSE_IOSTREAMH #if !wxUSE_IOSTREAMH
#define wxSTD std:: #define wxSTD std::
#else #else
#define wxSTD #define wxSTD
#endif #endif
/* /*