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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-14 11:30:58 -0700 (Sat, 14 Oct 2006)
New Revision: 5019

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c
Log:
 r3046 at earth:  boo | 2006-10-14 11:08:01 -0700
  r3034 at earth (orig r3854):  AlanLo | 2006-10-12 19:05:28 -0700
  
  Argh! more assignment statements inside asserts!
     assert( x = y ); is bad!
  When NDEBUG is define they disappear and x becomes undefined
  
  Fixing these to for optimised tests
  
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3045
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3853
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3046
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3854

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c	2006-10-14 18:30:55 UTC (rev 5018)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c	2006-10-14 18:30:58 UTC (rev 5019)
@@ -1592,9 +1592,11 @@
 #endif
 	
 	/* if overwrite/new */
-	assert( self->currDoc = xmlNewDoc( XML_VERSION ) );
+	self->currDoc = xmlNewDoc( XML_VERSION );
+	assert( self->currDoc );
 	/* create root element */
-	assert( rootNode = xmlNewNode( NULL, ROOT_NODE_NAME) );
+	rootNode = xmlNewNode( NULL, ROOT_NODE_NAME);
+	assert( rootNode );
 	
 	if ( !(correctNameSpace = Memory_Alloc_Array( char, correctLength, "courrectNameSpace" )) ) {
 		Journal_Printf(