From: Unknown (UG) <nobody@localhost>
Date: Fri, 16 Oct 1998 08:44:27 +0000 (+0000)
Subject: no message
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5f31d8628c46adb614eec98fdc6b100516def01d?ds=sidebyside

no message


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 3cb10f3186..70fdb635e1 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -88,14 +88,6 @@ 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::
-#else
-  #include  <iostream.h>
-  #define   NAMESPACE
-#endif  //Visual C++
-
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #define   NAMESPACE
@@ -104,6 +96,8 @@ extern const char *g_szNul = &g_strEmpty.dummy;
 #  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