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

[walter at geodynamics.org]

Author: walter
Date: 2007-03-08 21:35:49 -0800 (Thu, 08 Mar 2007)
New Revision: 6209

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/shortcuts.h
Log:
 r1675 at earth:  boo | 2007-03-08 21:35:10 -0800
 Cast NULL to a pointer to make xlc happy



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

Modified: long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/shortcuts.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/shortcuts.h	2007-03-09 03:41:45 UTC (rev 6208)
+++ long/3D/Gale/trunk/src/StGermain/Base/Foundation/src/shortcuts.h	2007-03-09 05:35:49 UTC (rev 6209)
@@ -79,8 +79,8 @@
 
 #define ReallocArray( ptr, type, size )					\
 	((ptr) ? ((size) ? Memory_Realloc_Array( ptr, type, size ) : 	\
-		  (Memory_Free( ptr ), NULL)) : 			\
-	 (size) ? Memory_Alloc_Array_Unnamed( type, size ) : NULL)
+		  (Memory_Free( ptr ), (type *)NULL)) :			\
+	 (size) ? Memory_Alloc_Array_Unnamed( type, size ) : (type *)NULL)
 
 #define ReallocNamedArray( ptr, type, size, name )			\
 	((ptr) ? ((size) ? Memory_Realloc_Array( ptr, type, size ) : 	\