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

walter at geodynamics.org walter at geodynamics.org
Tue Oct 31 13:30:11 PST 2006 

Author: walter
Date: 2006-10-31 13:30:09 -0800 (Tue, 31 Oct 2006)
New Revision: 5140

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c
   long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Init.c
   long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.c
   long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.c
   long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.c
Log:
 r3126 at earth:  boo | 2006-10-31 13:26:16 -0800
  r3104 at earth (orig r3881):  KathleenHumble | 2006-10-25 20:14:19 -0700
  casting variables that were being passed in as
  void* into a function requiring them to be defined
  as Stg_Component_DefaultConstructorFunction* 
  this was causing a lot of warnings on certain machines.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3125
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3880
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3126
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3881

Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c	2006-10-31 21:30:07 UTC (rev 5139)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c	2006-10-31 21:30:09 UTC (rev 5140)
@@ -78,7 +78,7 @@
 		_CompositeVC_Delete, 
 		_CompositeVC_Print,
 		_CompositeVC_Copy,
-		(void*)CompositeVC_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)CompositeVC_DefaultNew,
 		_CompositeVC_Construct,
 		_CompositeVC_Build,
 		_VariableCondition_Initialise,
@@ -109,7 +109,7 @@
 		_CompositeVC_Delete, 
 		_CompositeVC_Print,
 		_CompositeVC_Copy,
-		(void*)CompositeVC_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)CompositeVC_DefaultNew,
 		_CompositeVC_Construct,
 		_CompositeVC_Build,
 		_VariableCondition_Initialise,

Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Init.c	2006-10-31 21:30:07 UTC (rev 5139)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Init.c	2006-10-31 21:30:09 UTC (rev 5140)
@@ -86,10 +86,10 @@
 	/** Initializing the ComponentRegister singleton */
 	
 	/** Adding default constructors of various components to the Stg_ComponentRegister */
-	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Variable_Type, "0", (void*)Variable_DefaultNew );
-	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CompositeVC_Type, "0", (void*)CompositeVC_DefaultNew );
-	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SetVC_Type, "0", (void*)SetVC_DefaultNew );
-	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), VariableAllVC_Type, "0", (void*)VariableAllVC_DefaultNew );
+	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Variable_Type, "0", (Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew );
+	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CompositeVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)CompositeVC_DefaultNew );
+	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SetVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)SetVC_DefaultNew );
+	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), VariableAllVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)VariableAllVC_DefaultNew );
 
 	/** Register Parents for All Classes */
 	RegisterParent( Stg_ComponentFactory_Type,           Stg_Class_Type );

Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.c	2006-10-31 21:30:07 UTC (rev 5139)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.c	2006-10-31 21:30:09 UTC (rev 5140)
@@ -78,7 +78,7 @@
 		_SetVC_Delete, 
 		_SetVC_Print, 
 		_SetVC_Copy,
-		(void*)SetVC_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)SetVC_DefaultNew,
 		_VariableCondition_Construct,
 		_VariableCondition_Build,
 		_VariableCondition_Initialise,
@@ -109,7 +109,7 @@
 		_SetVC_Delete, 
 		_SetVC_Print, 
 		_SetVC_Copy,
-		(void*)SetVC_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)SetVC_DefaultNew,
 		_VariableCondition_Construct,
 		_VariableCondition_Build,
 		_VariableCondition_Initialise,

Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.c	2006-10-31 21:30:07 UTC (rev 5139)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.c	2006-10-31 21:30:09 UTC (rev 5140)
@@ -76,7 +76,7 @@
 		_Variable_Delete, 
 		_Variable_Print, 
 		_Variable_Copy,
-		(void*)Variable_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew,
 		_Variable_Construct,
 		_Variable_Build, 
 		_Variable_Initialise, 
@@ -107,7 +107,7 @@
 		_Variable_Delete, 
 		_Variable_Print, 
 		_Variable_Copy,
-		(void*)Variable_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew,
 		_Variable_Construct,
 		_Variable_Build, 
 		_Variable_Initialise, 
@@ -148,7 +148,7 @@
 		_Variable_Delete, 
 		_Variable_Print, 
 		_Variable_Copy,
-		(void*)Variable_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew,
 		_Variable_Construct,
 		_Variable_Build, 
 		_Variable_Initialise, 
@@ -203,7 +203,7 @@
 		_Variable_Delete, 
 		_Variable_Print, 
 		_Variable_Copy, 
-		(void*)Variable_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew,
 		_Variable_Construct,
 		_Variable_Build, 
 		_Variable_Initialise, 

Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.c	2006-10-31 21:30:07 UTC (rev 5139)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.c	2006-10-31 21:30:09 UTC (rev 5140)
@@ -81,7 +81,7 @@
 		_VariableAllVC_Delete, 
 		_VariableAllVC_Print, 
 		_VariableAllVC_Copy,
-		(void*)VariableAllVC_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)VariableAllVC_DefaultNew,
 		_VariableCondition_Construct,
 		_VariableAllVC_Build,
 		_VariableCondition_Initialise,
@@ -113,7 +113,7 @@
 		_VariableAllVC_Delete, 
 		_VariableAllVC_Print, 
 		_VariableAllVC_Copy,
-		(void*)VariableAllVC_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)VariableAllVC_DefaultNew,
 		_VariableCondition_Construct,
 		_VariableAllVC_Build,
 		_VariableCondition_Initialise,

More information about the cig-commits mailing list