Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed delete operator for VC++ 6.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-09-24 15:49:16 +00:00
parent d0dc2fe891
commit 76626af21b
4 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/memory.h
View File

@@ -57,6 +57,11 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
void * operator new (size_t size, char * fileName, int lineNum); void * operator new (size_t size, char * fileName, int lineNum);
void operator delete (void * buf); 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) ) #if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
void * operator new[] (size_t size, char * fileName, int lineNum); void * operator new[] (size_t size, char * fileName, int lineNum);
void operator delete[] (void * buf); void operator delete[] (void * buf);

5
include/wx/object.h
View File

@@ -182,6 +182,11 @@ class WXDLLEXPORT wxObject
void * operator new (size_t size, char * fileName = NULL, int lineNum = 0); void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
void operator delete (void * buf); void operator delete (void * buf);
// VC++ 6.0
#if _MSC_VER >= 1200
void operator delete(void *buf, char*, int);
#endif
// Cause problems for VC++ // Cause problems for VC++
#ifndef _MSC_VER #ifndef _MSC_VER
void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0); void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);

8
src/common/memory.cpp
View File

@@ -932,6 +932,14 @@ void operator delete (void * buf)
#endif #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) ) #if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
void operator delete[] (void * buf) void operator delete[] (void * buf)
{ {

8
src/common/object.cpp
View File

@@ -109,6 +109,14 @@ void wxObject::operator delete (void * buf)
wxDebugFree(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 // Cause problems for VC++ - crashes
#ifndef _MSC_VER #ifndef _MSC_VER
void * wxObject::operator new[] (size_t size, char * fileName, int lineNum) void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)