[cig-commits] r5143 - in long/3D/Gale/trunk/src/StGermain: .
Discretisation/Utils/src Discretisation/Utils/tests
walter at geodynamics.org
walter at geodynamics.org
Tue Oct 31 13:30:21 PST 2006
Author: walter
Date: 2006-10-31 13:30:18 -0800 (Tue, 31 Oct 2006)
New Revision: 5143
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllElementsVC.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllNodesVC.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CornerVC.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/DofLayout.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FrictionVC.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Init.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/InnerWallVC.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/MeshCoarsener_Hexa.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/OperatorFieldVariable.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SemiRegDeform.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SplitFrictionWallVC.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/WallVC.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testFieldVariable_Register.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testOperatorFieldVariable.c
Log:
r3129 at earth: boo | 2006-10-31 13:26:17 -0800
r3107 at earth (orig r3884): KathleenHumble | 2006-10-25 22:26: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:3128
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3883
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3129
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3884
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllElementsVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllElementsVC.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllElementsVC.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -68,7 +68,7 @@
_AllElementsVC_Delete,
_AllElementsVC_Print,
_AllElementsVC_Copy,
- (void*)AllElementsVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)AllElementsVC_DefaultNew,
_AllElementsVC_Construct,
_AllElementsVC_Build,
_VariableCondition_Initialise,
@@ -106,7 +106,7 @@
_AllElementsVC_Delete,
_AllElementsVC_Print,
_AllElementsVC_Copy,
- (void*)AllElementsVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)AllElementsVC_DefaultNew,
_AllElementsVC_Construct,
_AllElementsVC_Build,
_VariableCondition_Initialise,
@@ -149,7 +149,7 @@
self->_delete = _AllElementsVC_Delete;
self->_print = _AllElementsVC_Print;
self->_copy = _AllElementsVC_Copy;
- self->_defaultConstructor = (void*)AllElementsVC_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)AllElementsVC_DefaultNew;
self->_construct = _AllElementsVC_Construct,
self->_build = _AllElementsVC_Build;
self->_initialise = _VariableCondition_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllNodesVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllNodesVC.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/AllNodesVC.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -69,7 +69,7 @@
_AllNodesVC_Delete,
_AllNodesVC_Print,
_AllNodesVC_Copy,
- (void*)AllNodesVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)AllNodesVC_DefaultNew,
_AllNodesVC_Construct,
_AllNodesVC_Build,
_VariableCondition_Initialise,
@@ -107,7 +107,7 @@
_AllNodesVC_Delete,
_AllNodesVC_Print,
_AllNodesVC_Copy,
- (void*)AllNodesVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)AllNodesVC_DefaultNew,
_AllNodesVC_Construct,
_AllNodesVC_Build,
_VariableCondition_Initialise,
@@ -150,7 +150,7 @@
self->_delete = _AllNodesVC_Delete;
self->_print = _AllNodesVC_Print;
self->_copy = _AllNodesVC_Copy;
- self->_defaultConstructor = (void*)AllNodesVC_DefaultNew,
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)AllNodesVC_DefaultNew,
self->_construct = _AllNodesVC_Construct,
self->_build = _VariableCondition_Build;
self->_initialise = _VariableCondition_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CornerVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CornerVC.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/CornerVC.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -80,7 +80,7 @@
_CornerVC_Delete,
_CornerVC_Print,
_CornerVC_Copy,
- (void*)CornerVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)CornerVC_DefaultNew,
_CornerVC_Construct,
_CornerVC_Build,
_VariableCondition_Initialise,
@@ -118,7 +118,7 @@
_CornerVC_Delete,
_CornerVC_Print,
_CornerVC_Copy,
- (void*)CornerVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)CornerVC_DefaultNew,
_CornerVC_Construct,
_CornerVC_Build,
_VariableCondition_Initialise,
@@ -161,7 +161,7 @@
self->_delete = _CornerVC_Delete;
self->_print = _CornerVC_Print;
self->_copy = _CornerVC_Copy;
- self->_defaultConstructor = (void*)CornerVC_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)CornerVC_DefaultNew;
self->_construct = _CornerVC_Construct;
self->_build = _CornerVC_Build;
self->_initialise = _VariableCondition_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/DofLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/DofLayout.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/DofLayout.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -70,7 +70,7 @@
_DofLayout_Delete,
_DofLayout_Print,
_DofLayout_Copy,
- (void*)DofLayout_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)DofLayout_DefaultNew,
_DofLayout_Construct,
_DofLayout_Build,
_DofLayout_Initialise,
@@ -90,7 +90,7 @@
_DofLayout_Delete,
_DofLayout_Print,
_DofLayout_Copy,
- (void*)DofLayout_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)DofLayout_DefaultNew,
_DofLayout_Construct,
_DofLayout_Build,
_DofLayout_Initialise,
@@ -114,7 +114,7 @@
self->_delete = _Variable_Delete;
self->_print = _Variable_Print;
self->_copy = _DofLayout_Copy;
- self->_defaultConstructor = (void*)DofLayout_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)DofLayout_DefaultNew;
self->_construct = _DofLayout_Construct;
self->_build = _DofLayout_Build;
self->_execute = _DofLayout_Execute;
@@ -147,7 +147,7 @@
/* Allocate memory/General info */
assert(_sizeOfSelf >= sizeof(DofLayout));
- self = (DofLayout*)_Stg_Component_New( _sizeOfSelf, type, _delete, _print, _copy, (void*)DofLayout_DefaultNew,
+ self = (DofLayout*)_Stg_Component_New( _sizeOfSelf, type, _delete, _print, _copy, (Stg_Component_DefaultConstructorFunction*)DofLayout_DefaultNew,
_construct, _build, _initialise, _execute, _destroy, name, NON_GLOBAL );
/* Virtual info */
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -59,7 +59,7 @@
_FieldVariable_Delete,
_FieldVariable_Print,
_FieldVariable_Copy,
- (void*)FieldVariable_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)FieldVariable_DefaultNew,
_FieldVariable_Construct,
_FieldVariable_Build,
_FieldVariable_Initialise,
@@ -98,7 +98,7 @@
_FieldVariable_Delete,
_FieldVariable_Print,
_FieldVariable_Copy,
- (void*)FieldVariable_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)FieldVariable_DefaultNew,
_FieldVariable_Construct,
_FieldVariable_Build,
_FieldVariable_Initialise,
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FrictionVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FrictionVC.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FrictionVC.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -71,7 +71,7 @@
_FrictionVC_Delete,
_FrictionVC_Print,
_FrictionVC_Copy,
- (void*)FrictionVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)FrictionVC_DefaultNew,
_FrictionVC_Construct,
_FrictionVC_Build,
_VariableCondition_Initialise,
@@ -109,7 +109,7 @@
_FrictionVC_Delete,
_FrictionVC_Print,
_FrictionVC_Copy,
- (void*)FrictionVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)FrictionVC_DefaultNew,
_FrictionVC_Construct,
_FrictionVC_Build,
_VariableCondition_Initialise,
@@ -152,7 +152,7 @@
self->_delete = _FrictionVC_Delete;
self->_print = _FrictionVC_Print;
self->_copy = _FrictionVC_Copy;
- self->_defaultConstructor = (void*)FrictionVC_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)FrictionVC_DefaultNew;
self->_construct = _FrictionVC_Construct;
self->_build = _FrictionVC_Build;
self->_initialise = _VariableCondition_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Init.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Init.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -75,20 +75,20 @@
VariableCondition_Register_Add( variableCondition_Register, FrictionVC_Type, FrictionVC_Factory );
VariableCondition_Register_Add( variableCondition_Register, SplitFrictionWallVC_Type, SplitFrictionWallVC_Factory );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), AllElementsVC_Type, "0", (void*)AllElementsVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), AllNodesVC_Type, "0", (void*)AllNodesVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), DofLayout_Type, "0", (void*)DofLayout_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), FieldVariable_Type, "0", (void*)FieldVariable_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), OperatorFieldVariable_Type, "0", (void*)OperatorFieldVariable_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), WallVC_Type, "0", (void*)WallVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CornerVC_Type, "0", (void*)CornerVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), InnerWallVC_Type, "0", (void*)InnerWallVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), AllElementsVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)AllElementsVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), AllNodesVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)AllNodesVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), DofLayout_Type, "0", (Stg_Component_DefaultConstructorFunction*)DofLayout_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), FieldVariable_Type, "0", (Stg_Component_DefaultConstructorFunction*)FieldVariable_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), OperatorFieldVariable_Type, "0", (Stg_Component_DefaultConstructorFunction*)OperatorFieldVariable_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), WallVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)WallVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CornerVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)CornerVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), InnerWallVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)InnerWallVC_DefaultNew );
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ShapeVC_Type, "0", _ShapeVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), FrictionVC_Type, "0", (void*)FrictionVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SplitFrictionWallVC_Type, "0", (void*)SplitFrictionWallVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Remesher_Type, "0", (void*)_Remesher_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), StripRemesher_Type, "0", (void*)_StripRemesher_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CellRemesher_Type, "0", (void*)_CellRemesher_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), FrictionVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)FrictionVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SplitFrictionWallVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)SplitFrictionWallVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Remesher_Type, "0", (Stg_Component_DefaultConstructorFunction*)_Remesher_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), StripRemesher_Type, "0", (Stg_Component_DefaultConstructorFunction*)_StripRemesher_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CellRemesher_Type, "0", (Stg_Component_DefaultConstructorFunction*)_CellRemesher_DefaultNew );
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), TimeIntegrator_Type,"0", _TimeIntegrator_DefaultNew );
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), TimeIntegratee_Type,"0", _TimeIntegratee_DefaultNew );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/InnerWallVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/InnerWallVC.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/InnerWallVC.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -77,7 +77,7 @@
_InnerWallVC_Delete,
_InnerWallVC_Print,
_InnerWallVC_Copy,
- (void*)InnerWallVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)InnerWallVC_DefaultNew,
_InnerWallVC_Construct,
_InnerWallVC_Build,
_VariableCondition_Initialise,
@@ -115,7 +115,7 @@
_InnerWallVC_Delete,
_InnerWallVC_Print,
_InnerWallVC_Copy,
- (void*)InnerWallVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)InnerWallVC_DefaultNew,
_InnerWallVC_Construct,
_InnerWallVC_Build,
_VariableCondition_Initialise,
@@ -158,7 +158,7 @@
self->_delete = _InnerWallVC_Delete;
self->_print = _InnerWallVC_Print;
self->_copy = _InnerWallVC_Copy;
- self->_defaultConstructor = (void*)InnerWallVC_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)InnerWallVC_DefaultNew;
self->_construct = _InnerWallVC_Construct;
self->_build = _InnerWallVC_Build;
self->_initialise = _VariableCondition_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/MeshCoarsener_Hexa.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/MeshCoarsener_Hexa.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/MeshCoarsener_Hexa.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -58,7 +58,7 @@
_MeshCoarsener_Hexa_Delete,
_MeshCoarsener_Hexa_Print,
NULL,
- (void*)MeshCoarsener_Hexa_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)MeshCoarsener_Hexa_DefaultNew,
_MeshCoarsener_Hexa_Construct,
_MeshCoarsener_Hexa_Build,
_MeshCoarsener_Hexa_Initialise,
@@ -79,7 +79,7 @@
_MeshCoarsener_Hexa_Delete,
_MeshCoarsener_Hexa_Print,
NULL,
- (void*)MeshCoarsener_Hexa_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)MeshCoarsener_Hexa_DefaultNew,
_MeshCoarsener_Hexa_Construct,
_MeshCoarsener_Hexa_Build,
_MeshCoarsener_Hexa_Initialise,
@@ -106,7 +106,7 @@
self->_delete = _MeshCoarsener_Hexa_Delete;
self->_print = _MeshCoarsener_Hexa_Print;
self->_copy = NULL;
- self->_defaultConstructor = (void*) MeshCoarsener_Hexa_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*) MeshCoarsener_Hexa_DefaultNew;
self->_construct = _MeshCoarsener_Hexa_Construct;
self->_build = _MeshCoarsener_Hexa_Build;
self->_initialise = _MeshCoarsener_Hexa_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/OperatorFieldVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/OperatorFieldVariable.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/OperatorFieldVariable.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -98,7 +98,7 @@
_FieldVariable_Delete,
_OperatorFieldVariable_Print,
_OperatorFieldVariable_Copy,
- (void*)OperatorFieldVariable_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)OperatorFieldVariable_DefaultNew,
_OperatorFieldVariable_Construct,
_OperatorFieldVariable_Build,
_OperatorFieldVariable_Initialise,
@@ -138,7 +138,7 @@
_FieldVariable_Delete,
_OperatorFieldVariable_Print,
_OperatorFieldVariable_Copy,
- (void*)OperatorFieldVariable_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)OperatorFieldVariable_DefaultNew,
_OperatorFieldVariable_Construct,
_OperatorFieldVariable_Build,
_OperatorFieldVariable_Initialise,
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SemiRegDeform.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SemiRegDeform.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SemiRegDeform.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -61,7 +61,7 @@
_SemiRegDeform_Delete,
_SemiRegDeform_Print,
NULL,
- (void*)SemiRegDeform_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)SemiRegDeform_DefaultNew,
_SemiRegDeform_Construct,
_SemiRegDeform_Build,
_SemiRegDeform_Initialise,
@@ -78,7 +78,7 @@
_SemiRegDeform_Delete,
_SemiRegDeform_Print,
NULL,
- (void*)SemiRegDeform_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)SemiRegDeform_DefaultNew,
_SemiRegDeform_Construct,
_SemiRegDeform_Build,
_SemiRegDeform_Initialise,
@@ -140,7 +140,7 @@
self->_delete = _SemiRegDeform_Delete;
self->_print = _SemiRegDeform_Print;
self->_copy = NULL;
- self->_defaultConstructor = (void*)SemiRegDeform_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)SemiRegDeform_DefaultNew;
self->_construct = _SemiRegDeform_Construct;
self->_build = _SemiRegDeform_Build;
self->_execute = _SemiRegDeform_Execute;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SplitFrictionWallVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SplitFrictionWallVC.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/SplitFrictionWallVC.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -71,7 +71,7 @@
_SplitFrictionWallVC_Delete,
_SplitFrictionWallVC_Print,
_SplitFrictionWallVC_Copy,
- (void*)SplitFrictionWallVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)SplitFrictionWallVC_DefaultNew,
_SplitFrictionWallVC_Construct,
_SplitFrictionWallVC_Build,
_VariableCondition_Initialise,
@@ -109,7 +109,7 @@
_SplitFrictionWallVC_Delete,
_SplitFrictionWallVC_Print,
_SplitFrictionWallVC_Copy,
- (void*)SplitFrictionWallVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)SplitFrictionWallVC_DefaultNew,
_SplitFrictionWallVC_Construct,
_SplitFrictionWallVC_Build,
_VariableCondition_Initialise,
@@ -152,7 +152,7 @@
self->_delete = _SplitFrictionWallVC_Delete;
self->_print = _SplitFrictionWallVC_Print;
self->_copy = _SplitFrictionWallVC_Copy;
- self->_defaultConstructor = (void*)SplitFrictionWallVC_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)SplitFrictionWallVC_DefaultNew;
self->_construct = _SplitFrictionWallVC_Construct;
self->_build = _SplitFrictionWallVC_Build;
self->_initialise = _VariableCondition_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/WallVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/WallVC.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/WallVC.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -77,7 +77,7 @@
_WallVC_Delete,
_WallVC_Print,
_WallVC_Copy,
- (void*)WallVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)WallVC_DefaultNew,
_WallVC_Construct,
_WallVC_Build,
_VariableCondition_Initialise,
@@ -115,7 +115,7 @@
_WallVC_Delete,
_WallVC_Print,
_WallVC_Copy,
- (void*)WallVC_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)WallVC_DefaultNew,
_WallVC_Construct,
_WallVC_Build,
_VariableCondition_Initialise,
@@ -158,7 +158,7 @@
self->_delete = _WallVC_Delete;
self->_print = _WallVC_Print;
self->_copy = _WallVC_Copy;
- self->_defaultConstructor = (void*)WallVC_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)WallVC_DefaultNew;
self->_construct = _WallVC_Construct;
self->_build = _WallVC_Build;
self->_initialise = _VariableCondition_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testFieldVariable_Register.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testFieldVariable_Register.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testFieldVariable_Register.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -81,7 +81,7 @@
/* abstract class, so have to hack constructor */
for (ii=0; ii < 3; ii++ ) {
testFVs[ii] = _FieldVariable_New( sizeof(FieldVariable), FieldVariable_Type, _Stg_Component_Delete,
- _Stg_Component_Print, NULL, (void*)FieldVariable_DefaultNew, _Variable_Construct, _Variable_Build,
+ _Stg_Component_Print, NULL, (Stg_Component_DefaultConstructorFunction*)FieldVariable_DefaultNew, _Variable_Construct, _Variable_Build,
_Variable_Initialise, _Variable_Execute, _Variable_Destroy, fvNames[ii], True,
dummyInterpolateValueAt,
dummyGetMinGlobalValue, dummyGetMaxGlobalValue,
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testOperatorFieldVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testOperatorFieldVariable.c 2006-10-31 21:30:15 UTC (rev 5142)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/tests/testOperatorFieldVariable.c 2006-10-31 21:30:18 UTC (rev 5143)
@@ -114,7 +114,7 @@
_FieldVariable_Delete,
_FieldVariable_Print,
_FieldVariable_Copy,
- (void*)FieldVariable_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)FieldVariable_DefaultNew,
_FieldVariable_Construct,
_FieldVariable_Build,
_FieldVariable_Initialise,
More information about the cig-commits
mailing list