X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..ee146bca1b2d76b3e486c66a2d5ad15e44f2cbd0:/src/common/memory.cpp 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) )