[cig-commits] r5142 - in long/3D/Gale/trunk/src/StGermain: .
Discretisation/Mesh/src
walter at geodynamics.org
walter at geodynamics.org
Tue Oct 31 13:30:16 PST 2006
Author: walter
Date: 2006-10-31 13:30:15 -0800 (Tue, 31 Oct 2006)
New Revision: 5142
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/BodyNL.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CornerNL.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/DummyMD.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaMD.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGeometry.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshLayout.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.c
Log:
r3128 at earth: boo | 2006-10-31 13:26:17 -0800
r3106 at earth (orig r3883): KathleenHumble | 2006-10-25 22:00:23 -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:3127
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3882
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3128
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3883
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/BodyNL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/BodyNL.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/BodyNL.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -60,7 +60,7 @@
_BodyNL_Delete,
_BodyNL_Print,
NULL,
- (void*)BodyNL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)BodyNL_DefaultNew,
_BodyNL_Construct,
_BodyNL_Build,
_BodyNL_Initialise,
@@ -92,7 +92,7 @@
_BodyNL_Delete,
_BodyNL_Print,
NULL,
- (void*)BodyNL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)BodyNL_DefaultNew,
_BodyNL_Construct,
_BodyNL_Build,
_BodyNL_Initialise,
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CornerNL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CornerNL.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CornerNL.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -60,7 +60,7 @@
_CornerNL_Delete,
_CornerNL_Print,
_CornerNL_Copy,
- (void*)CornerNL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)CornerNL_DefaultNew,
_CornerNL_Construct,
_CornerNL_Build,
_CornerNL_Initialise,
@@ -92,7 +92,7 @@
_CornerNL_Delete,
_CornerNL_Print,
_CornerNL_Copy,
- (void*)CornerNL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)CornerNL_DefaultNew,
_CornerNL_Construct,
_CornerNL_Build,
_CornerNL_Initialise,
@@ -129,7 +129,7 @@
self->_delete = _CornerNL_Delete;
self->_print = _CornerNL_Print;
self->_copy = _CornerNL_Copy;
- self->_defaultConstructor = (void*)CornerNL_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)CornerNL_DefaultNew;
self->_construct = _CornerNL_Construct;
self->_build = _CornerNL_Build;
self->_initialise = _CornerNL_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/DummyMD.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/DummyMD.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/DummyMD.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -61,7 +61,7 @@
_DummyMD_Delete,
_DummyMD_Print,
NULL,
- (void*)DummyMD_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)DummyMD_DefaultNew,
_DummyMD_Construct,
_DummyMD_Build,
_DummyMD_Initialise,
@@ -104,7 +104,7 @@
_DummyMD_Delete,
_DummyMD_Print,
NULL,
- (void*)DummyMD_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)DummyMD_DefaultNew,
_DummyMD_Construct,
_DummyMD_Build,
_DummyMD_Initialise,
@@ -153,7 +153,7 @@
self->_delete = _DummyMD_Delete;
self->_print = _DummyMD_Print;
self->_copy = NULL;
- self->_defaultConstructor = (void*)DummyMD_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)DummyMD_DefaultNew;
self->_construct = _DummyMD_Construct;
self->_build = _DummyMD_Build;
self->_initialise = _DummyMD_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaEL.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -67,7 +67,7 @@
_HexaEL_Delete,
_HexaEL_Print,
_HexaEL_Copy,
- (void*)HexaEL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)HexaEL_DefaultNew,
_HexaEL_Construct,
_HexaEL_Build,
_HexaEL_Initialise,
@@ -103,7 +103,7 @@
_HexaEL_Delete,
_HexaEL_Print,
_HexaEL_Copy,
- (void*)HexaEL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)HexaEL_DefaultNew,
_HexaEL_Construct,
_HexaEL_Build,
_HexaEL_Initialise,
@@ -144,7 +144,7 @@
self->_delete = _HexaEL_Delete;
self->_print = _HexaEL_Print;
self->_copy = _HexaEL_Copy;
- self->_defaultConstructor = (void*)HexaEL_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)HexaEL_DefaultNew;
self->_construct = _HexaEL_Construct;
self->_build = _HexaEL_Build;
self->_initialise = _HexaEL_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaMD.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaMD.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/HexaMD.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -66,7 +66,7 @@
_HexaMD_Delete,
_HexaMD_Print,
_HexaMD_Copy,
- (void*)HexaMD_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)HexaMD_DefaultNew,
_HexaMD_Construct,
_HexaMD_Build,
_HexaMD_Initialise,
@@ -113,7 +113,7 @@
_HexaMD_Delete,
_HexaMD_Print,
_HexaMD_Copy,
- (void*)HexaMD_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)HexaMD_DefaultNew,
_HexaMD_Construct,
_HexaMD_Build,
_HexaMD_Initialise,
@@ -163,7 +163,7 @@
self->_delete = _HexaMD_Delete;
self->_print = _HexaMD_Print;
self->_copy = _HexaMD_Copy;
- self->_defaultConstructor = (void*)HexaMD_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)HexaMD_DefaultNew;
self->_construct = _HexaMD_Construct;
self->_build = _HexaMD_Build;
self->_initialise = _HexaMD_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Init.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -68,22 +68,22 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(),
- MeshTopology_Type, "0", (void*)MeshTopology_New );
+ MeshTopology_Type, "0", (Stg_Component_DefaultConstructorFunction*)MeshTopology_New );
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(),
- CartesianGenerator_Type, "0", (void*)CartesianGenerator_New );
+ CartesianGenerator_Type, "0", (Stg_Component_DefaultConstructorFunction*)CartesianGenerator_New );
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(),
- SurfaceAdaptor_Type, "0", (void*)SurfaceAdaptor_New );
+ SurfaceAdaptor_Type, "0", (Stg_Component_DefaultConstructorFunction*)SurfaceAdaptor_New );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), BodyNL_Type, "0", (void*)BodyNL_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CornerNL_Type, "0", (void*)CornerNL_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), DummyMD_Type, "0", (void*)DummyMD_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), HexaMD_Type, "0", (void*)HexaMD_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), HexaEL_Type, "0", (void*)HexaEL_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IrregEL_Type, "0", (void*)IrregEL_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ParallelPipedHexaEL_Type, "0", (void*)ParallelPipedHexaEL_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), MeshGeometry_Type, "0", (void*)MeshGeometry_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Mesh_Type, "0", (void*)Mesh_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), MeshLayout_Type, "0", (void*)MeshLayout_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), BodyNL_Type, "0", (Stg_Component_DefaultConstructorFunction*)BodyNL_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CornerNL_Type, "0", (Stg_Component_DefaultConstructorFunction*)CornerNL_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), DummyMD_Type, "0", (Stg_Component_DefaultConstructorFunction*)DummyMD_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), HexaMD_Type, "0", (Stg_Component_DefaultConstructorFunction*)HexaMD_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), HexaEL_Type, "0", (Stg_Component_DefaultConstructorFunction*)HexaEL_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IrregEL_Type, "0", (Stg_Component_DefaultConstructorFunction*)IrregEL_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ParallelPipedHexaEL_Type, "0", (Stg_Component_DefaultConstructorFunction*)ParallelPipedHexaEL_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), MeshGeometry_Type, "0", (Stg_Component_DefaultConstructorFunction*)MeshGeometry_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Mesh_Type, "0", (Stg_Component_DefaultConstructorFunction*)Mesh_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), MeshLayout_Type, "0", (Stg_Component_DefaultConstructorFunction*)MeshLayout_DefaultNew );
RegisterParent( MeshTopology_Type, Stg_Component_Type );
RegisterParent( CartesianGenerator_Type, MeshGenerator_Type );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/IrregEL.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -61,7 +61,7 @@
_IrregEL_Delete,
_IrregEL_Print,
NULL,
- (void*)IrregEL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IrregEL_DefaultNew,
_IrregEL_Construct,
_IrregEL_ComponentBuild,
_IrregEL_Initialise,
@@ -99,7 +99,7 @@
_IrregEL_Delete,
_IrregEL_Print,
NULL,
- (void*)IrregEL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IrregEL_DefaultNew,
_IrregEL_Construct,
_IrregEL_ComponentBuild,
_IrregEL_Initialise,
@@ -143,7 +143,7 @@
self->_delete = _IrregEL_Delete;
self->_print = _IrregEL_Print;
self->_copy = NULL;
- self->_defaultConstructor = (void*)IrregEL_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)IrregEL_DefaultNew;
self->_construct = _IrregEL_Construct;
self->_build = _IrregEL_ComponentBuild;
self->_initialise = _IrregEL_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGeometry.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGeometry.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshGeometry.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -62,7 +62,7 @@
_MeshGeometry_Delete,
_MeshGeometry_Print,
_MeshGeometry_Copy,
- (void*)MeshGeometry_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)MeshGeometry_DefaultNew,
_MeshGeometry_Construct,
_MeshGeometry_Build,
_MeshGeometry_Initialise,
@@ -85,7 +85,7 @@
_MeshGeometry_Delete,
_MeshGeometry_Print,
_MeshGeometry_Copy,
- (void*)MeshGeometry_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)MeshGeometry_DefaultNew,
_MeshGeometry_Construct,
_MeshGeometry_Build,
_MeshGeometry_Initialise,
@@ -114,7 +114,7 @@
self->_delete = _MeshGeometry_Delete;
self->_print = _MeshGeometry_Print;
self->_copy = _MeshGeometry_Copy;
- self->_defaultConstructor = (void*)MeshGeometry_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)MeshGeometry_DefaultNew;
self->_construct = _MeshGeometry_Construct;
self->_build = _MeshGeometry_Build;
self->_initialise = _MeshGeometry_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshLayout.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/MeshLayout.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -61,7 +61,7 @@
_MeshLayout_Delete,
_MeshLayout_Print,
_MeshLayout_Copy,
- (void*)MeshLayout_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)MeshLayout_DefaultNew,
_MeshLayout_Construct,
_MeshLayout_Build,
_MeshLayout_Initialise,
@@ -86,7 +86,7 @@
_MeshLayout_Delete,
_MeshLayout_Print,
_MeshLayout_Copy,
- (void*)MeshLayout_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)MeshLayout_DefaultNew,
_MeshLayout_Construct,
_MeshLayout_Build,
_MeshLayout_Initialise,
@@ -115,7 +115,7 @@
self->_delete = _MeshLayout_Delete;
self->_print = _MeshLayout_Print;
self->_copy = _MeshLayout_Copy;
- self->_defaultConstructor = (void*)MeshLayout_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)MeshLayout_DefaultNew;
self->_construct = _MeshLayout_Construct;
self->_build = _MeshLayout_Build;
self->_initialise = _MeshLayout_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.c 2006-10-31 21:30:13 UTC (rev 5141)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/ParallelPipedHexaEL.c 2006-10-31 21:30:15 UTC (rev 5142)
@@ -65,7 +65,7 @@
_ParallelPipedHexaEL_Delete,
_ParallelPipedHexaEL_Print,
_ParallelPipedHexaEL_Copy,
- (void*)ParallelPipedHexaEL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)ParallelPipedHexaEL_DefaultNew,
_ParallelPipedHexaEL_Construct,
_ParallelPipedHexaEL_Build,
_ParallelPipedHexaEL_Initialise,
@@ -99,7 +99,7 @@
_ParallelPipedHexaEL_Delete,
_ParallelPipedHexaEL_Print,
_ParallelPipedHexaEL_Copy,
- (void*)ParallelPipedHexaEL_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)ParallelPipedHexaEL_DefaultNew,
_ParallelPipedHexaEL_Construct,
_ParallelPipedHexaEL_Build,
_ParallelPipedHexaEL_Initialise,
@@ -138,7 +138,7 @@
self->_delete = _ParallelPipedHexaEL_Delete;
self->_print = _ParallelPipedHexaEL_Print;
self->_copy = _ParallelPipedHexaEL_Copy;
- self->_defaultConstructor = (void*)ParallelPipedHexaEL_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)ParallelPipedHexaEL_DefaultNew;
self->_construct = _ParallelPipedHexaEL_Construct;
self->_build = _ParallelPipedHexaEL_Stg_ComponentBuild;
self->_initialise = _ParallelPipedHexaEL_Initialise;
More information about the cig-commits
mailing list