Update of /cvsroot/mahogany/M/include
In directory usw-pr-cvs1:/tmp/cvs-serv17095/include
Modified Files:
Mconfig.h
Log Message:
using wxUSE_IOSTREAMH for including <iostream.h> or <iostream>
Index: Mconfig.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Mconfig.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -b -u -2 -r1.46 -r1.47
--- Mconfig.h 12 Sep 2002 16:47:02 -0000 1.46
+++ Mconfig.h 19 Oct 2002 17:40:39 -0000 1.47
@@ -148,11 +148,8 @@
// you can't mix iostream.h and iostream, the former doesn't compile
-// with "using namespace std", the latter doesn't compile with wxWin
-// make your choice...
-#ifndef USE_IOSTREAMH
-# define USE_IOSTREAMH 1
-#endif
+// with "using namespace std", the latter doesn't compile with older
+// compilers.
-#ifdef USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
# include <iostream.h>
# include <fstream.h>
@@ -160,10 +157,4 @@
# include <iostream>
# include <fstream>
-#endif
-
-#ifdef USE_IOSTREAMH
- // can't use namespace std because old iostream doesn't compile with it
- // and can't use std::list because it's a template class
-#else
using namespace std;
#endif
-------------------------------------------------------
This sf.net email is sponsored by:
Access Your PC Securely with GoToMyPC. Try Free Now
https://www.gotomypc.com/s/OSND/DD
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
