[cig-commits] r5141 - in long/3D/Gale/trunk/src/StGermain: .
Discretisation/Geometry/src
walter at geodynamics.org
walter at geodynamics.org
Tue Oct 31 13:30:13 PST 2006
Author: walter
Date: 2006-10-31 13:30:13 -0800 (Tue, 31 Oct 2006)
New Revision: 5141
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/BlockGeometry.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK26Topology.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK6Topology.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Init.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregGeometry.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregTopology.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ShellGeometry.c
Log:
r3127 at earth: boo | 2006-10-31 13:26:16 -0800
r3105 at earth (orig r3882): KathleenHumble | 2006-10-25 21:41:18 -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:3126
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3881
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3127
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3882
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/BlockGeometry.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/BlockGeometry.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/BlockGeometry.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -60,7 +60,7 @@
_BlockGeometry_Delete,
_BlockGeometry_Print,
_BlockGeometry_Copy,
- (void*)BlockGeometry_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)BlockGeometry_DefaultNew,
_BlockGeometry_Construct,
_BlockGeometry_Build,
_BlockGeometry_Initialise,
@@ -83,7 +83,7 @@
_BlockGeometry_Delete,
_BlockGeometry_Print,
_BlockGeometry_Copy,
- (void*)BlockGeometry_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)BlockGeometry_DefaultNew,
_BlockGeometry_Construct,
_BlockGeometry_Build,
_BlockGeometry_Initialise,
@@ -112,7 +112,7 @@
self->_delete = _BlockGeometry_Delete;
self->_print = _BlockGeometry_Print;
self->_copy = _BlockGeometry_Copy;
- self->_defaultConstructor = (void*)BlockGeometry_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)BlockGeometry_DefaultNew;
self->_construct = _BlockGeometry_Construct;
self->_build = _BlockGeometry_Build;
self->_initialise = _BlockGeometry_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Delaunay.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -78,7 +78,7 @@
_Delaunay_Delete,
_Delaunay_Print,
_Delaunay_Copy,
- (void*)Delaunay_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)Delaunay_DefaultNew,
_Delaunay_Construct,
_Delaunay_Build,
_Delaunay_Initialise,
@@ -109,7 +109,7 @@
_Delaunay_Delete,
_Delaunay_Print,
_Delaunay_Copy,
- (void*)Delaunay_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)Delaunay_DefaultNew,
_Delaunay_Construct,
_Delaunay_Build,
_Delaunay_Initialise,
@@ -146,7 +146,7 @@
self->_delete = _Delaunay_Delete;
self->_print = _Delaunay_Print;
self->_copy = _Delaunay_Copy;
- self->_defaultConstructor = (void*)Delaunay_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)Delaunay_DefaultNew;
self->_construct = _Delaunay_Construct;
self->_build = _Delaunay_Build;
self->_initialise = _Delaunay_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK26Topology.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK26Topology.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK26Topology.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -60,7 +60,7 @@
_IJK26Topology_Delete,
_IJK26Topology_Print,
_IJKTopology_Copy,
- (void*)IJK26Topology_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IJK26Topology_DefaultNew,
_IJK26Topology_Construct,
_IJK26Topology_Build,
_IJK26Topology_Initialise,
@@ -87,7 +87,7 @@
_IJK26Topology_Delete,
_IJK26Topology_Print,
_IJKTopology_Copy,
- (void*)IJK26Topology_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IJK26Topology_DefaultNew,
_IJK26Topology_Construct,
_IJK26Topology_Build,
_IJK26Topology_Initialise,
@@ -120,7 +120,7 @@
self->_delete = _IJK26Topology_Delete;
self->_print = _IJK26Topology_Print;
self->_copy = _IJKTopology_Copy;
- self->_defaultConstructor = (void*)IJK26Topology_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)IJK26Topology_DefaultNew;
self->_construct = _IJK26Topology_Construct;
self->_build = _IJK26Topology_Build;
self->_initialise = _IJK26Topology_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK6Topology.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK6Topology.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IJK6Topology.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -60,7 +60,7 @@
_IJK6Topology_Delete,
_IJK6Topology_Print,
_IJKTopology_Copy,
- (void*)IJK6Topology_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IJK6Topology_DefaultNew,
_IJK6Topology_Construct,
_IJK6Topology_Build,
_IJK6Topology_Initialise,
@@ -87,7 +87,7 @@
_IJK6Topology_Delete,
_IJK6Topology_Print,
_IJKTopology_Copy,
- (void*)IJK6Topology_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IJK6Topology_DefaultNew,
_IJK6Topology_Construct,
_IJK6Topology_Build,
_IJK6Topology_Initialise,
@@ -119,7 +119,7 @@
self->_delete = _IJK6Topology_Delete;
self->_print = _IJK6Topology_Print;
self->_copy = _IJKTopology_Copy;
- self->_defaultConstructor = (void*)IJK6Topology_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)IJK6Topology_DefaultNew;
self->_construct = _IJK6Topology_Construct;
self->_build = _IJK6Topology_Build,
self->_initialise = _IJK6Topology_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Init.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/Init.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -54,15 +54,15 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IJK6Topology_Type, "0", (void*)IJK6Topology_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IJK26Topology_Type, "0", (void*)IJK26Topology_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IrregTopology_Type, "0", (void*)IrregTopology_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), BlockGeometry_Type, "0", (void*)BlockGeometry_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IJK6Topology_Type, "0", (Stg_Component_DefaultConstructorFunction*)IJK6Topology_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IJK26Topology_Type, "0", (Stg_Component_DefaultConstructorFunction*)IJK26Topology_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IrregTopology_Type, "0", (Stg_Component_DefaultConstructorFunction*)IrregTopology_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), BlockGeometry_Type, "0", (Stg_Component_DefaultConstructorFunction*)BlockGeometry_DefaultNew );
Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), RefinedRegionsGeometry_Type, "0", RefinedRegionsGeometry_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ShellGeometry_Type, "0", (void*)ShellGeometry_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IrregGeometry_Type, "0", (void*)IrregGeometry_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Delaunay_Type, "0", (void*)Delaunay_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ParallelDelaunay_Type, "0", (void*)ParallelDelaunay_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ShellGeometry_Type, "0", (Stg_Component_DefaultConstructorFunction*)ShellGeometry_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), IrregGeometry_Type, "0", (Stg_Component_DefaultConstructorFunction*)IrregGeometry_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Delaunay_Type, "0", (Stg_Component_DefaultConstructorFunction*)Delaunay_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ParallelDelaunay_Type, "0", (Stg_Component_DefaultConstructorFunction*)ParallelDelaunay_DefaultNew );
RegisterParent( Delaunay_Type, Stg_Component_Type );
RegisterParent( ParallelDelaunay_Type, Delaunay_Type );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregGeometry.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregGeometry.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregGeometry.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -58,7 +58,7 @@
_IrregGeometry_Delete,
_IrregGeometry_Print,
NULL,
- (void*)IrregGeometry_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IrregGeometry_DefaultNew,
_IrregGeometry_Construct,
_IrregGeometry_Build,
_IrregGeometry_Initialise,
@@ -83,7 +83,7 @@
_IrregGeometry_Delete,
_IrregGeometry_Print,
NULL,
- (void*)IrregGeometry_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IrregGeometry_DefaultNew,
_IrregGeometry_Construct,
_IrregGeometry_Build,
_IrregGeometry_Initialise,
@@ -114,7 +114,7 @@
self->_delete = _IrregGeometry_Delete;
self->_print = _IrregGeometry_Print;
self->_copy = NULL;
- self->_defaultConstructor = (void*)IrregGeometry_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)IrregGeometry_DefaultNew;
self->_construct = _IrregGeometry_Construct;
self->_build = _IrregGeometry_Build;
self->_initialise = _IrregGeometry_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregTopology.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregTopology.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/IrregTopology.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -58,7 +58,7 @@
_IrregTopology_Delete,
_IrregTopology_Print,
NULL,
- (void*)IrregTopology_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IrregTopology_DefaultNew,
_IrregTopology_Construct,
_IrregTopology_Build,
_IrregTopology_Initialise,
@@ -83,7 +83,7 @@
_IrregTopology_Delete,
_IrregTopology_Print,
NULL,
- (void*)IrregTopology_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)IrregTopology_DefaultNew,
_IrregTopology_Construct,
_IrregTopology_Build,
_IrregTopology_Initialise,
@@ -114,7 +114,7 @@
self->_delete = _IrregTopology_Delete;
self->_print = _IrregTopology_Print;
self->_copy = NULL;
- self->_defaultConstructor = (void*)IrregTopology_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)IrregTopology_DefaultNew;
self->_construct = _IrregTopology_Construct;
self->_build = _IrregTopology_Build;
self->_initialise = _IrregTopology_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ParallelDelaunay.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -76,7 +76,7 @@
_ParallelDelaunay_Delete,
_ParallelDelaunay_Print,
_ParallelDelaunay_Copy,
- (void*)ParallelDelaunay_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)ParallelDelaunay_DefaultNew,
_ParallelDelaunay_Construct,
_ParallelDelaunay_Build,
_ParallelDelaunay_Initialise,
@@ -111,7 +111,7 @@
_ParallelDelaunay_Delete,
_ParallelDelaunay_Print,
_ParallelDelaunay_Copy,
- (void*)ParallelDelaunay_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)ParallelDelaunay_DefaultNew,
_ParallelDelaunay_Construct,
_ParallelDelaunay_Build,
_ParallelDelaunay_Initialise,
@@ -152,7 +152,7 @@
self->_delete = _ParallelDelaunay_Delete;
self->_print = _ParallelDelaunay_Print;
self->_copy = _ParallelDelaunay_Copy;
- self->_defaultConstructor = (void*)ParallelDelaunay_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)ParallelDelaunay_DefaultNew;
self->_construct = _ParallelDelaunay_Construct;
self->_build = _ParallelDelaunay_Build;
self->_initialise = _ParallelDelaunay_Initialise;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ShellGeometry.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ShellGeometry.c 2006-10-31 21:30:09 UTC (rev 5140)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ShellGeometry.c 2006-10-31 21:30:13 UTC (rev 5141)
@@ -60,7 +60,7 @@
_ShellGeometry_Delete,
_ShellGeometry_Print,
NULL,
- (void*)ShellGeometry_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)ShellGeometry_DefaultNew,
_ShellGeometry_Construct,
_ShellGeometry_Build,
_ShellGeometry_Initialise,
@@ -83,7 +83,7 @@
_ShellGeometry_Delete,
_ShellGeometry_Print,
NULL,
- (void*)ShellGeometry_DefaultNew,
+ (Stg_Component_DefaultConstructorFunction*)ShellGeometry_DefaultNew,
_ShellGeometry_Construct,
_ShellGeometry_Build,
_ShellGeometry_Initialise,
@@ -112,7 +112,7 @@
self->_delete = _ShellGeometry_Delete;
self->_print = _ShellGeometry_Print;
self->_copy = NULL;
- self->_defaultConstructor = (void*)ShellGeometry_DefaultNew;
+ self->_defaultConstructor = (Stg_Component_DefaultConstructorFunction*)ShellGeometry_DefaultNew;
self->_construct = _ShellGeometry_Construct;
self->_build = _ShellGeometry_Build;
self->_initialise = _ShellGeometry_Initialise;
More information about the cig-commits
mailing list