Minor modifications...

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 0f61ce0516254d7a0d439c2a9703280c1400a208..4a4117e410b4ce97044673203fe69dc10700de67 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -23,14 +23,18 @@
   info, or to be a straight call to the new operator.
 */
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 #include <stddef.h>
 
-#if USE_IOSTREAMH
-#include <iostream.h>
+#if wxUSE_IOSTREAMH
+// N.B. BC++ doesn't have istream.h, ostream.h
+#  include <iostream.h>
 #else
-#include <iostream>
+#  include <ostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
 #endif
 
 #include "wx/string.h"
@@ -48,7 +52,7 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 // Currently, these merely call malloc and free; only the wxObject
 // operators do something interesting. But this allows WXDEBUG_NEW to
 // work for all 'new's in a file.
-#if USE_GLOBAL_MEMORY_OPERATORS
+#if wxUSE_GLOBAL_MEMORY_OPERATORS
 
 #ifdef new
 #undef new
@@ -57,6 +61,11 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
+// VC++ 6.0
+#if _MSC_VER >= 1200
+void operator delete(void *buf, char*, int);
+#endif
+
 #if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);