From 766a1d00c31a074bf92c60ac85765590d36d889f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 26 Sep 2005 12:39:55 +0000 Subject: [PATCH] corrected #ifdef order (might help linking with wxUSE_MEMORY_TRACING==1) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/memory.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/memory.cpp b/src/common/memory.cpp index e3fd5b0551..1a6fae329d 100644 --- a/src/common/memory.cpp +++ b/src/common/memory.cpp @@ -907,10 +907,11 @@ private: static MemoryCriticalSection memLocker; -#endif +#endif // USE_THREADSAFE_MEMORY_ALLOCATION + -#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) #ifdef __WXDEBUG__ +#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) #if wxUSE_GLOBAL_MEMORY_OPERATORS void * operator new (size_t size, wxChar * fileName, int lineNum) { @@ -943,8 +944,8 @@ void operator delete[] (void * buf) wxDebugFree(buf, true); } #endif // wxUSE_ARRAY_MEMORY_OPERATORS -#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) #endif // wxUSE_GLOBAL_MEMORY_OPERATORS +#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))) // TODO: store whether this is a vector or not. void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) ) -- 2.45.2