[cig-commits] r7695 - in long/3D/Gale/trunk: .
src/StGermain/Base/Automation/src
walter at geodynamics.org
walter at geodynamics.org
Wed Jul 18 11:37:23 PDT 2007
Author: walter
Date: 2007-07-18 11:37:22 -0700 (Wed, 18 Jul 2007)
New Revision: 7695
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.h
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Init.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.h
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.h
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.h
Log:
r1879 at earth: boo | 2007-07-18 11:32:10 -0700
Clean up more compiler warnings
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1878
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1879
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c 2007-07-18 18:37:22 UTC (rev 7695)
@@ -78,7 +78,7 @@
_CompositeVC_Delete,
_CompositeVC_Print,
_CompositeVC_Copy,
- (Stg_Component_DefaultConstructorFunction*)CompositeVC_DefaultNew,
+ CompositeVC_DefaultNew,
_CompositeVC_Construct,
_CompositeVC_Build,
_VariableCondition_Initialise,
@@ -101,7 +101,7 @@
data );
}
-CompositeVC* CompositeVC_DefaultNew( Name name )
+void* CompositeVC_DefaultNew( Name name )
{
return (CompositeVC*)_CompositeVC_New(
sizeof(CompositeVC),
@@ -109,7 +109,7 @@
_CompositeVC_Delete,
_CompositeVC_Print,
_CompositeVC_Copy,
- (Stg_Component_DefaultConstructorFunction*)CompositeVC_DefaultNew,
+ CompositeVC_DefaultNew,
_CompositeVC_Construct,
_CompositeVC_Build,
_VariableCondition_Initialise,
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.h 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.h 2007-07-18 18:37:22 UTC (rev 7695)
@@ -78,7 +78,7 @@
Dictionary* dictionary,
void* data );
- CompositeVC* CompositeVC_DefaultNew( Name name );
+ void* CompositeVC_DefaultNew( Name name );
void CompositeVC_Init(
CompositeVC* self,
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Init.c 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Init.c 2007-07-18 18:37:22 UTC (rev 7695)
@@ -86,10 +86,10 @@
/** Initializing the ComponentRegister singleton */
/** Adding default constructors of various components to the Stg_ComponentRegister */
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Variable_Type, "0", (Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CompositeVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)CompositeVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SetVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)SetVC_DefaultNew );
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), VariableAllVC_Type, "0", (Stg_Component_DefaultConstructorFunction*)VariableAllVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Variable_Type, "0", Variable_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), CompositeVC_Type, "0", CompositeVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), SetVC_Type, "0", SetVC_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), VariableAllVC_Type, "0", VariableAllVC_DefaultNew );
/** Register Parents for All Classes */
RegisterParent( Stg_ComponentFactory_Type, Stg_Class_Type );
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.c 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.c 2007-07-18 18:37:22 UTC (rev 7695)
@@ -78,7 +78,7 @@
_SetVC_Delete,
_SetVC_Print,
_SetVC_Copy,
- (Stg_Component_DefaultConstructorFunction*)SetVC_DefaultNew,
+ SetVC_DefaultNew,
_VariableCondition_Construct,
_VariableCondition_Build,
_VariableCondition_Initialise,
@@ -101,7 +101,7 @@
dictionary );
}
-SetVC* SetVC_DefaultNew( Name name )
+void* SetVC_DefaultNew( Name name )
{
return (SetVC*)_SetVC_New(
sizeof(SetVC),
@@ -109,7 +109,7 @@
_SetVC_Delete,
_SetVC_Print,
_SetVC_Copy,
- (Stg_Component_DefaultConstructorFunction*)SetVC_DefaultNew,
+ SetVC_DefaultNew,
_VariableCondition_Construct,
_VariableCondition_Build,
_VariableCondition_Initialise,
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.h 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/SetVC.h 2007-07-18 18:37:22 UTC (rev 7695)
@@ -80,7 +80,7 @@
ConditionFunction_Register* conFunc_Register,
Dictionary* dictionary );
- SetVC* SetVC_DefaultNew( Name name );
+ void* SetVC_DefaultNew( Name name );
void SetVC_Init(
SetVC* self,
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.c 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.c 2007-07-18 18:37:22 UTC (rev 7695)
@@ -76,7 +76,7 @@
_Variable_Delete,
_Variable_Print,
_Variable_Copy,
- (Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew,
+ Variable_DefaultNew,
_Variable_Construct,
_Variable_Build,
_Variable_Initialise,
@@ -97,7 +97,7 @@
return self;
}
-Variable* Variable_DefaultNew( Name name )
+void* Variable_DefaultNew( Name name )
{
Variable* self;
@@ -107,7 +107,7 @@
_Variable_Delete,
_Variable_Print,
_Variable_Copy,
- (Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew,
+ Variable_DefaultNew,
_Variable_Construct,
_Variable_Build,
_Variable_Initialise,
@@ -148,7 +148,7 @@
_Variable_Delete,
_Variable_Print,
_Variable_Copy,
- (Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew,
+ Variable_DefaultNew,
_Variable_Construct,
_Variable_Build,
_Variable_Initialise,
@@ -203,7 +203,7 @@
_Variable_Delete,
_Variable_Print,
_Variable_Copy,
- (Stg_Component_DefaultConstructorFunction*)Variable_DefaultNew,
+ Variable_DefaultNew,
_Variable_Construct,
_Variable_Build,
_Variable_Initialise,
@@ -249,7 +249,7 @@
_Variable_Delete,
_Variable_Print,
_Variable_Copy,
- (void*)Variable_DefaultNew,
+ Variable_DefaultNew,
_Variable_Construct,
_Variable_Build,
_Variable_Initialise,
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.h 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Variable.h 2007-07-18 18:37:22 UTC (rev 7695)
@@ -152,7 +152,7 @@
Variable_Register* vr );
- Variable* Variable_DefaultNew( Name name );
+ void* Variable_DefaultNew( Name name );
/** Creates a new Variable. A Variable holds the run-time information of a complex data type created by the programmer.
* Essentially it associates a textual name to a variable in the program that the user can use to access or modify.
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.c 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.c 2007-07-18 18:37:22 UTC (rev 7695)
@@ -81,7 +81,7 @@
_VariableAllVC_Delete,
_VariableAllVC_Print,
_VariableAllVC_Copy,
- (Stg_Component_DefaultConstructorFunction*)VariableAllVC_DefaultNew,
+ VariableAllVC_DefaultNew,
_VariableCondition_Construct,
_VariableAllVC_Build,
_VariableCondition_Initialise,
@@ -105,7 +105,7 @@
data );
}
-VariableAllVC* VariableAllVC_DefaultNew( Name name )
+void* VariableAllVC_DefaultNew( Name name )
{
return (VariableAllVC*)_VariableAllVC_New(
sizeof(VariableAllVC),
@@ -113,7 +113,7 @@
_VariableAllVC_Delete,
_VariableAllVC_Print,
_VariableAllVC_Copy,
- (Stg_Component_DefaultConstructorFunction*)VariableAllVC_DefaultNew,
+ VariableAllVC_DefaultNew,
_VariableCondition_Construct,
_VariableAllVC_Build,
_VariableCondition_Initialise,
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.h 2007-07-18 18:37:13 UTC (rev 7694)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/VariableAllVC.h 2007-07-18 18:37:22 UTC (rev 7695)
@@ -92,7 +92,7 @@
Dictionary* dictionary,
void* mesh );
- VariableAllVC* VariableAllVC_DefaultNew( Name name );
+ void* VariableAllVC_DefaultNew( Name name );
VariableAllVC* _VariableAllVC_New(
SizeT _sizeOfSelf,
More information about the cig-commits
mailing list