[cig-commits] r6807 - in long/3D/Gale/trunk: . src/StGermain/Base/Foundation/src

[walter at geodynamics.org]

Author: walter
Date: 2007-05-09 11:26:50 -0700 (Wed, 09 May 2007)
New Revision: 6807

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/Memory.c
   long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryTag.h
Log:
 r1806 at earth:  boo | 2007-05-09 11:24:30 -0700
 Make NOEXPERIMENT flag work



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1804
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1806

Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/Memory.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/Memory.c	2007-05-09 17:29:20 UTC (rev 6806)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/Memory.c	2007-05-09 18:26:50 UTC (rev 6807)
@@ -1780,7 +1780,7 @@
 	int count = 0;
 #ifdef NOEXPERIMENT
 	result =  realloc( ptr, size );
-	if ( result == NULL ) {
+	if ( result == NULL && size!=0 ) {
 		Memory_OutOfMemoryError( size );
 	}
 	return result;

Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryTag.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryTag.h	2007-05-09 17:29:20 UTC (rev 6806)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/MemoryTag.h	2007-05-09 18:26:50 UTC (rev 6807)
@@ -53,11 +53,21 @@
 	struct MemoryTag { __MemoryTag };
 
 
+#ifdef NOEXPERIMENT
+
+	#define Memory_CountGet( ptr ) (0)
+	
+	#define Memory_CountInc( ptr )
+
+	#define Memory_CountDec( ptr )
+#else
+
 	#define Memory_CountGet( ptr ) ((MemoryTag*)( (ArithPointer)(ptr) - sizeof(MemoryTag) ))->instCount
 	
 	#define Memory_CountInc( ptr ) ( Memory_CountGet( ptr )++ )
 
 	#define Memory_CountDec( ptr ) ( Memory_CountGet( ptr )-- )
+#endif
 
 	#define Memory_SizeGet( ptr ) ((MemoryTag*)( (ArithPointer)(ptr) - sizeof(MemoryTag) ))->size