X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4de6207afa9a78be63fe93df44ff5b90cecd2781..7d56fb8fcdb469bdef549319b2d81ab4b02b5a67:/include/wx/memory.h diff --git a/include/wx/memory.h b/include/wx/memory.h index 85d2e2954f..21b9545a96 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -68,20 +68,22 @@ void wxDebugFree(void * buf, bool isVect = FALSE); // Added JACS 25/11/98: needed for some compilers void * operator new (size_t size); +WXDLLEXPORT void * operator new (size_t size, wxChar * fileName, int lineNum); -void * operator new (size_t size, wxChar * fileName, int lineNum); +#if !defined(__VISAGECPP__) void operator delete (void * buf); +#endif #if wxUSE_ARRAY_MEMORY_OPERATORS - void * operator new[] (size_t size); - void * operator new[] (size_t size, wxChar * fileName, int lineNum); - void operator delete[] (void * buf); + WXDLLEXPORT void* operator new[] (size_t size); + WXDLLEXPORT void* operator new[] (size_t size, wxChar * fileName, int lineNum); + WXDLLEXPORT void operator delete[] (void * buf); #endif // VC++ 6.0 #if defined(__VISUALC__) && (__VISUALC__ >= 1200) - void operator delete(void *buf, wxChar*, int); - void operator delete[](void *buf, wxChar*, int); + WXDLLEXPORT void operator delete(void *buf, wxChar*, int); + WXDLLEXPORT void operator delete[](void *buf, wxChar*, int); #endif #endif @@ -217,7 +219,7 @@ public: static void SetCheckpoint(bool all = FALSE); static wxMemStruct *GetCheckpoint(void) { return checkPoint; } - + // Calculated from the request size and any padding needed // before the final marker. static size_t PaddedSize (const size_t reqSize);