Applied compilation fix for memory.cpp.

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 9e6c3beaed7b98fce4c235b808c75e9f1f0a2e64..a6a4a32d50488188dc45ce1f198f57159455eeaa 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -917,6 +917,8 @@ static MemoryCriticalSection memLocker;
 
 #endif
 
 
 #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);
 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);
 }
 
     free((char *)st);
 }
 

+#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
+#endif // __WXDEBUG__
+

 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar * ...)
 {
 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar * ...)
 {