no message

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index d5afed37dee3b6c784ac350c1cb6c3c3c6092019..6950dc80ccf1250149af7f01ee4c610dcd67dc26 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -37,7 +37,14 @@
 
 #if WXDEBUG || wxUSE_DEBUG_CONTEXT
   // for wxObject::Dump
-  #include <iostream.h>
+#if wxUSE_IOSTREAMH
+#  include <iostream.h>
+#else
+#  include <iostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+#endif
 #endif
 
 #if !USE_SHARED_LIBRARY
@@ -111,7 +118,7 @@ void wxObject::operator delete (void * buf)
 
 // VC++ 6.0
 #if _MSC_VER >= 1200
-void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+void operator wxObject::delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
  ::operator delete(pData);
 }