[cig-commits] commit: Minor changes to compile warnings-causing code lines.

[Mercurial]

changeset:   319:e5230235aafc
branch:      pcu_rejig
parent:      317:4801a60eda49
user:        JericoRevote
date:        Thu Nov 19 16:53:20 2009 +1100
files:       MaterialPoints/src/PICelleratorContext.c MaterialPoints/src/SwarmVariableField.c Utils/src/MaterialSwarmVariable.c
description:
Minor changes to compile warnings-causing code lines.


diff -r 4801a60eda49 -r e5230235aafc MaterialPoints/src/PICelleratorContext.c
--- a/MaterialPoints/src/PICelleratorContext.c	Wed Nov 18 18:23:22 2009 +1100
+++ b/MaterialPoints/src/PICelleratorContext.c	Thu Nov 19 16:53:20 2009 +1100
@@ -97,9 +97,9 @@ void* _PICelleratorContext_DefaultNew( N
 		NULL, 
 		_PICelleratorContext_DefaultNew,
 		_PICelleratorContext_AssignFromXML,
-		_FiniteElementContext_Build,
-		_FiniteElementContext_Initialise,
-		_AbstractContext_Execute,
+		(Stg_Component_BuildFunction*)_FiniteElementContext_Build,
+		(Stg_Component_InitialiseFunction*)_FiniteElementContext_Initialise,
+		(Stg_Component_ExecuteFunction*)_AbstractContext_Execute,
 		_PICelleratorContext_Destroy,
 		name,
 		NON_GLOBAL,
diff -r 4801a60eda49 -r e5230235aafc MaterialPoints/src/SwarmVariableField.c
--- a/MaterialPoints/src/SwarmVariableField.c	Wed Nov 18 18:23:22 2009 +1100
+++ b/MaterialPoints/src/SwarmVariableField.c	Thu Nov 19 16:53:20 2009 +1100
@@ -157,7 +157,7 @@ void* _SwarmVariableField_DefaultNew( Na
 			_FeVariable_InterpolateNodeValuesToElLocalCoord,
 			_FeVariable_GetValueAtNode,
 			/*_SwarmVariableField_GetValueAtNode,*/
-			_SwarmVariableField_ValueAtParticle,
+			(ParticleFeVariable_ValueAtParticleFunction*)_SwarmVariableField_ValueAtParticle,
 			name );
 }
 
diff -r 4801a60eda49 -r e5230235aafc Utils/src/MaterialSwarmVariable.c
--- a/Utils/src/MaterialSwarmVariable.c	Wed Nov 18 18:23:22 2009 +1100
+++ b/Utils/src/MaterialSwarmVariable.c	Thu Nov 19 16:53:20 2009 +1100
@@ -141,17 +141,17 @@ void _MaterialSwarmVariable_Init(
 }
 
 void MaterialSwarmVariable_InitAll( 
-		void*                                               swarmVariable,
-		AbstractContext*                                    context,
-		MaterialPointsSwarm*                                swarm,
-		Index                                               dofCount,
-		Materials_Register*                                 materials_Register,
-		ExtensionInfo_Index                                 materialExtensionHandle,
-		SizeT                                               offset )
+	void*                                               swarmVariable,
+	AbstractContext*                                    context,
+	MaterialPointsSwarm*                                swarm,
+	Index                                               dofCount,
+	Materials_Register*                                 materials_Register,
+	ExtensionInfo_Index                                 materialExtensionHandle,
+	SizeT                                               offset )
 {
 	MaterialSwarmVariable* self = (MaterialSwarmVariable*) swarmVariable;
 
-	_SwarmVariable_Init( self, context, (Swarm*)swarm, NULL, dofCount );
+	_SwarmVariable_Init( (SwarmVariable*)self, context, (Swarm*)swarm, NULL, dofCount );
 	_MaterialSwarmVariable_Init( self, materials_Register, materialExtensionHandle, offset );
 }