From fa6ca47e019fa71a563ab7bc6979838d1ddfdd2c Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 6 Feb 2005 12:42:34 +0000 Subject: [PATCH] Applied compilation fix for memory.cpp. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/memory.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/common/memory.cpp b/src/common/memory.cpp index 9e6c3beaed..a6a4a32d50 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -917,6 +917,8 @@ static MemoryCriticalSection memLocker; #endif +#ifdef __WXDEBUG__ +#if wxUSE_GLOBAL_MEMORY_OPERATORS void * operator new (size_t size, wxChar * fileName, int lineNum) { return wxDebugAlloc(size, fileName, lineNum, false, false); @@ -1059,6 +1061,9 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) ) free((char *)st); } +#endif // wxUSE_GLOBAL_MEMORY_OPERATORS +#endif // __WXDEBUG__ + // Trace: send output to the current debugging stream void wxTrace(const wxChar * ...) {