[cig-commits] r5144 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Swarm/src

[walter at geodynamics.org]

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

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/Init.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriSingleCellLayout.c
Log:
 r3130 at earth:  boo | 2006-10-31 13:26:17 -0800
  r3108 at earth (orig r3885):  KathleenHumble | 2006-10-25 22:52:26 -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:3129
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3884
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3130
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3885

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/Init.c	2006-10-31 21:30:18 UTC (rev 5143)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
@@ -93,8 +93,8 @@
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), FileParticleLayout_Type, "0", _FileParticleLayout_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SingleCellLayout_Type, "0", _SingleCellLayout_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ElementCellLayout_Type, "0", _ElementCellLayout_DefaultNew );
-	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), TriSingleCellLayout_Type, "0", (void*)TriSingleCellLayout_DefaultNew );
-	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Swarm_Type, "0", (void*)Swarm_DefaultNew );
+	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), TriSingleCellLayout_Type, "0", (Stg_Component_DefaultConstructorFunction*)TriSingleCellLayout_DefaultNew );
+	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Swarm_Type, "0", (Stg_Component_DefaultConstructorFunction*)Swarm_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SwarmVariable_Type, "0", _SwarmVariable_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), OperatorSwarmVariable_Type, "0", _OperatorSwarmVariable_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SwarmOutput_Type, "0", _SwarmOutput_DefaultNew );

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c	2006-10-31 21:30:18 UTC (rev 5143)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/ParticleCommHandler.c	2006-10-31 21:30:23 UTC (rev 5144)
@@ -60,7 +60,7 @@
 {
 	return _ParticleCommHandler_New( sizeof(ParticleCommHandler), ParticleCommHandler_Type,
 		_ParticleCommHandler_Delete, _ParticleCommHandler_Print, _ParticleCommHandler_Copy,
-		(void*)ParticleCommHandler_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)ParticleCommHandler_DefaultNew,
 		_ParticleCommHandler_Construct, _ParticleCommHandler_Build, _ParticleCommHandler_Initialise,
 		_ParticleCommHandler_Execute, _ParticleCommHandler_Destroy, name, False,
 		_ParticleCommHandler_HandleParticleMovementBetweenProcs, NULL );
@@ -72,7 +72,7 @@
 {
 	return _ParticleCommHandler_New( sizeof(ParticleCommHandler), ParticleCommHandler_Type,
 		_ParticleCommHandler_Delete, _ParticleCommHandler_Print, _ParticleCommHandler_Copy,
-		(void*)ParticleCommHandler_DefaultNew,
+		(Stg_Component_DefaultConstructorFunction*)ParticleCommHandler_DefaultNew,
 		_ParticleCommHandler_Construct, _ParticleCommHandler_Build, _ParticleCommHandler_Initialise,
 		_ParticleCommHandler_Execute, _ParticleCommHandler_Destroy, name, True,
 		_ParticleCommHandler_HandleParticleMovementBetweenProcs, swarm );

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriSingleCellLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriSingleCellLayout.c	2006-10-31 21:30:18 UTC (rev 5143)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriSingleCellLayout.c	2006-10-31 21:30:23 UTC (rev 5144)
@@ -50,7 +50,7 @@
 {
 	return (TriSingleCellLayout*)_TriSingleCellLayout_New( sizeof(TriSingleCellLayout), TriSingleCellLayout_Type,
 		_TriSingleCellLayout_Delete, _TriSingleCellLayout_Print, _TriSingleCellLayout_Copy,
-		(void*)TriSingleCellLayout_DefaultNew, _TriSingleCellLayout_Construct,
+		(Stg_Component_DefaultConstructorFunction*)TriSingleCellLayout_DefaultNew, _TriSingleCellLayout_Construct,
 		_TriSingleCellLayout_Build, _TriSingleCellLayout_Initialise, _TriSingleCellLayout_Execute,
 		_TriSingleCellLayout_Destroy, name, False,
 		_TriSingleCellLayout_CellLocalCount, _TriSingleCellLayout_CellShadowCount,
@@ -63,7 +63,7 @@
 TriSingleCellLayout* TriSingleCellLayout_New( Name name, int dim, Dictionary* dictionary ) { 
 	return _TriSingleCellLayout_New( sizeof(TriSingleCellLayout), TriSingleCellLayout_Type, _TriSingleCellLayout_Delete,
 		_TriSingleCellLayout_Print, _TriSingleCellLayout_Copy,
-		(void*)TriSingleCellLayout_DefaultNew, _TriSingleCellLayout_Construct,
+		(Stg_Component_DefaultConstructorFunction*)TriSingleCellLayout_DefaultNew, _TriSingleCellLayout_Construct,
 		_TriSingleCellLayout_Build, _TriSingleCellLayout_Initialise, _TriSingleCellLayout_Execute,
 		_TriSingleCellLayout_Destroy, name, True,
 		_TriSingleCellLayout_CellLocalCount, _TriSingleCellLayout_CellShadowCount,
@@ -83,7 +83,7 @@
 	self->_delete = _TriSingleCellLayout_Delete;
 	self->_print = _TriSingleCellLayout_Print;
 	self->_copy = _TriSingleCellLayout_Copy;
-	self->_defaultConstructor = (void*) TriSingleCellLayout_DefaultNew;
+	self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*) TriSingleCellLayout_DefaultNew;
 	self->_construct = _TriSingleCellLayout_Construct;
 	self->_build = _TriSingleCellLayout_Build;
 	self->_initialise = _TriSingleCellLayout_Initialise;