[cig-commits] r4378 - in long/3D/Gale/trunk/src/Underworld: . src

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:19:06 -0700 (Thu, 17 Aug 2006)
New Revision: 4378

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/src/main.c
Log:
 r507 at earth:  boo | 2006-08-17 17:15:34 -0700
  r481 at earth (orig r312):  WalterLandry | 2006-08-17 16:48:02 -0700
  Fix a statement/declaration mix that does not work on older compilers
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:506
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:311
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:507
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:312

Modified: long/3D/Gale/trunk/src/Underworld/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/src/main.c	2006-08-18 00:19:04 UTC (rev 4377)
+++ long/3D/Gale/trunk/src/Underworld/src/main.c	2006-08-18 00:19:06 UTC (rev 4378)
@@ -100,6 +100,8 @@
 	Dictionary*        componentDict;
 	UnderworldContext* context         = NULL;
 	
+	char* errMessage = "Component dictionary must have unique names\n";
+
 	/* Initialise PETSc, get world info */
 	MPI_Init( &argc, &argv );
 	MPI_Comm_dup( MPI_COMM_WORLD, &CommWorld );
@@ -133,7 +135,6 @@
 	context->CF = Stg_ComponentFactory_New( dictionary, componentDict, context->register_Register );
 
 	/*check components dictionary for double entries */
-	char* errMessage = "Component dictionary must have unique names\n";
 	CheckDictionaryKeys(componentDict, errMessage);
 
 	LiveComponentRegister_Add( context->CF->LCRegister, (Stg_Component*) context );