Fixed delete operator for VC++ 6.

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 0f61ce0516254d7a0d439c2a9703280c1400a208..80b942505c93b3f9d461e8002141f960c8448f20 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -57,6 +57,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);

diff --git a/include/wx/object.h b/include/wx/object.h
index 16f2aebe352d8f06d1c8b58c9822745911f48e15..26c175ef936b4fa6ddcc5f98f7dac3328f16bcd3 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -182,6 +182,11 @@ class WXDLLEXPORT wxObject
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
   
+// VC++ 6.0
+#if _MSC_VER >= 1200
+  void operator delete(void *buf, char*, int);
+#endif
+
   // Cause problems for VC++
 #ifndef _MSC_VER
   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 8ff4ae193c21d95b2926b3771ddbeab7b177c9a8..8f42be65a2df448fed9262a64316c42febf7b808 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -932,6 +932,14 @@ void operator delete (void * buf)
 #endif
 }
 
+// VC++ 6.0
+#if _MSC_VER >= 1200
+void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+{
+ ::operator delete(pData);
+}
+#endif
+
 #if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
 void operator delete[] (void * buf)
 {

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 9bfb34ca1dc94944cee8756794cb91dbeea03abc..52d95152bb2c1b2f67e6fb25d8555eac548f2206 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -109,6 +109,14 @@ void wxObject::operator delete (void * buf)
   wxDebugFree(buf);
 }
 
+// VC++ 6.0
+#if _MSC_VER >= 1200
+void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+{
+ ::operator delete(pData);
+}
+#endif
+
 // Cause problems for VC++ - crashes
 #ifndef _MSC_VER
 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)