[cig-commits] commit: renabling the build and initialise entry point

[Mercurial]

changeset:   339:84e6d0478ed4
branch:      pcu_rejig
user:        JohnMansour <john.mansour at maths.monash.edu.au>
date:        Tue Dec 01 14:01:08 2009 +1100
files:       MaterialPoints/src/PICelleratorContext.c
description:
renabling the build and initialise entry point


diff -r 7793c0c646c9 -r 84e6d0478ed4 MaterialPoints/src/PICelleratorContext.c
--- a/MaterialPoints/src/PICelleratorContext.c	Mon Nov 30 15:47:43 2009 +1100
+++ b/MaterialPoints/src/PICelleratorContext.c	Tue Dec 01 14:01:08 2009 +1100
@@ -97,8 +97,8 @@ void* _PICelleratorContext_DefaultNew( N
 	Stg_Class_CopyFunction*                                  _copy = NULL;
 	Stg_Component_DefaultConstructorFunction*  _defaultConstructor = _PICelleratorContext_DefaultNew;
 	Stg_Component_ConstructFunction*                    _construct = _PICelleratorContext_AssignFromXML;
-	Stg_Component_BuildFunction*                            _build = (Stg_Component_BuildFunction*)_FiniteElementContext_Build;
-	Stg_Component_InitialiseFunction*                  _initialise = (Stg_Component_InitialiseFunction*)_FiniteElementContext_Initialise;
+	Stg_Component_BuildFunction*                            _build = _AbstractContext_Build;
+	Stg_Component_InitialiseFunction*                  _initialise = _AbstractContext_Initialise;
 	Stg_Component_ExecuteFunction*                        _execute = (Stg_Component_ExecuteFunction*)_AbstractContext_Execute;
 	Stg_Component_DestroyFunction*                        _destroy = _PICelleratorContext_Destroy;
 	AllocationType                              nameAllocationType = NON_GLOBAL;
@@ -132,6 +132,8 @@ void _PICelleratorContext_Delete( void* 
 	
 	Journal_DPrintf( self->debug, "In: %s()\n", __func__ );
 
+	Stg_Class_Delete( self->materials_Register );
+
 	/* Stg_Class_Delete parent */
 	_FiniteElementContext_Delete( self );
 }
@@ -139,8 +141,6 @@ void _PICelleratorContext_Destroy( void*
 void _PICelleratorContext_Destroy( void* context ) {
 	PICelleratorContext* self = (PICelleratorContext*)context;
 	
-	Stg_Class_Delete( self->materials_Register );
-
 	_FiniteElementContext_Destroy( self );
 }