X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb4e5803ed1986a365218a7186e6090b1bdae083..520e470fdd0daef09c77938db642e4583933c90d:/src/common/string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 8b44df09b8..70fdb635e1 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -88,13 +88,19 @@ extern const char *g_szNul = &g_strEmpty.dummy;
 // iostream ones.
 //
 // ATTN: you can _not_ use both of these in the same program!
-#if 0 // def  _MSC_VER
-  #include  <iostream>
-  #define   NAMESPACE   std::
+#if wxUSE_IOSTREAMH
+#include <iostream.h>
+#define   NAMESPACE
 #else
-  #include  <iostream.h>
-  #define   NAMESPACE
-#endif  //Visual C++
+#include <iostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+// for msvc (bcc50+ also) you don't need these NAMESPACE defines,
+// using namespace std; takes care of that.
+#define   NAMESPACE   std::
+#endif
+
 
 NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
 {