From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 16 Jan 2005 13:40:04 +0000 (+0000)
Subject: Check for wxUSE_GLOBAL_MEMORY_OPERATORS before redefining new
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b58deaecffae0fecdecce16f48647e5061964db9

Check for wxUSE_GLOBAL_MEMORY_OPERATORS before redefining new


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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 55ee6b3424..93dcda02e5 100644
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -37,7 +37,7 @@
 
 // Normally, new is automatically defined to be the
 // debugging version. If not, this does it.
-#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_MEMORY_TRACING
+#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_MEMORY_TRACING && wxUSE_GLOBAL_MEMORY_OPERATORS
 #define new WXDEBUG_NEW
 #endif