More Motif changes (colour/font stuff)

[wxWidgets.git] / include / wx / memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 95d016c850c1ca4606e308df1b8fb97b5ea37b3d..8f5c81ae95b4657ac0118b83ee75e5174e055872 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -28,9 +28,12 @@
 #include <stddef.h>
 
 #if wxUSE_IOSTREAMH
 #include <stddef.h>
 
 #if wxUSE_IOSTREAMH

-#include <iostream.h>
+#  include <ostream.h>

 #else
 #else

-#include <iostream>
+#  include <ostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif

 #endif
 
 #include "wx/string.h"
 #endif
 
 #include "wx/string.h"