DebugAlloc and DebugFree must be present also if there is no overridden global new...

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index a6a4a32d50488188dc45ce1f198f57159455eeaa..18b7e30a689cfe298a83a01a928e8e7d10a092af 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -950,6 +950,7 @@ void operator delete[] (void * buf)
   wxDebugFree(buf, true);
 }
 #endif
   wxDebugFree(buf, true);
 }
 #endif

+#endif // wxUSE_GLOBAL_MEMORY_OPERATORS

 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )


@@ -1061,7 +1062,6 @@ 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
 #endif // __WXDEBUG__
 
 // Trace: send output to the current debugging stream