[Box Backup-commit] COMMIT r1762 - box/chris/merge/lib/common

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Thu, 26 Jul 2007 23:01:04 +0100


Author: chris
Date: 2007-07-26 23:01:04 +0100 (Thu, 26 Jul 2007)
New Revision: 1762

Modified:
   box/chris/merge/lib/common/Box.h
   box/chris/merge/lib/common/MemLeakFinder.h
Log:
Define DEBUG_NEW in the same file whether or not BOX_MEMORY_LEAK_TESTING
is defined, thanks Gary. (refs #3, merges [1668])


Modified: box/chris/merge/lib/common/Box.h
===================================================================
--- box/chris/merge/lib/common/Box.h	2007-07-26 22:00:41 UTC (rev 1761)
+++ box/chris/merge/lib/common/Box.h	2007-07-26 22:01:04 UTC (rev 1762)
@@ -95,6 +95,7 @@
 #ifdef BOX_MEMORY_LEAK_TESTING
 	// Memory leak testing
 	#include "MemLeakFinder.h"
+	#define DEBUG_NEW new(__FILE__,__LINE__)
 	#define MEMLEAKFINDER_NOT_A_LEAK(x)	memleakfinder_notaleak(x);
 	#define MEMLEAKFINDER_NO_LEAKS		MemLeakSuppressionGuard _guard;
 	#define MEMLEAKFINDER_INIT		memleakfinder_init();

Modified: box/chris/merge/lib/common/MemLeakFinder.h
===================================================================
--- box/chris/merge/lib/common/MemLeakFinder.h	2007-07-26 22:00:41 UTC (rev 1761)
+++ box/chris/merge/lib/common/MemLeakFinder.h	2007-07-26 22:01:04 UTC (rev 1762)
@@ -10,8 +10,6 @@
 #ifndef MEMLEAKFINDER__H
 #define MEMLEAKFINDER__H
 
-#define DEBUG_NEW new(__FILE__,__LINE__)
-
 #ifdef MEMLEAKFINDER_FULL_MALLOC_MONITORING
 	// include stdlib now, to avoid problems with having the macros defined already
 	#include <stdlib.h>