[cig-commits] commit: Fix all regular compiler warnings

[Mercurial]

changeset:   385:1823810c6608
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Jan 26 16:30:01 2010 -0800
files:       MaterialPoints/src/PICelleratorContext.c MaterialPoints/src/PICelleratorContext.h PopulationControl/src/EscapedRoutine.h PopulationControl/tests/EscapedRoutineSuite.c Utils/src/DiffusionSMT.c
description:
Fix all regular compiler warnings


diff -r f689df373a27 -r 1823810c6608 MaterialPoints/src/PICelleratorContext.c
--- a/MaterialPoints/src/PICelleratorContext.c	Tue Jan 26 12:39:41 2010 -0800
+++ b/MaterialPoints/src/PICelleratorContext.c	Tue Jan 26 16:30:01 2010 -0800
@@ -138,7 +138,7 @@ void _PICelleratorContext_Delete( void* 
 	_FiniteElementContext_Delete( self );
 }
 
-void _PICelleratorContext_Destroy( void* context ) {
+void _PICelleratorContext_Destroy( void *component, void* context ) {
 	PICelleratorContext* self = (PICelleratorContext*)context;
 	
 	_FiniteElementContext_Destroy( self );
diff -r f689df373a27 -r 1823810c6608 MaterialPoints/src/PICelleratorContext.h
--- a/MaterialPoints/src/PICelleratorContext.h	Tue Jan 26 12:39:41 2010 -0800
+++ b/MaterialPoints/src/PICelleratorContext.h	Tue Jan 26 16:30:01 2010 -0800
@@ -107,7 +107,7 @@
 	void _PICelleratorContext_Delete( void* context );
 
 	/* Destroy implementation */	
-	void _PICelleratorContext_Destroy( void* context );
+	void _PICelleratorContext_Destroy( void *component, void* context );
 
 	/* Print implementation */
 	void _PICelleratorContext_Print( void* context, Stream* stream );
diff -r f689df373a27 -r 1823810c6608 PopulationControl/src/EscapedRoutine.h
--- a/PopulationControl/src/EscapedRoutine.h	Tue Jan 26 12:39:41 2010 -0800
+++ b/PopulationControl/src/EscapedRoutine.h	Tue Jan 26 16:30:01 2010 -0800
@@ -141,6 +141,6 @@
 	void EscapedRoutine_SortParticleList( void* escapedRoutine );
 
 	void EscapedRoutine_RemoveParticles( void* escapedRoutine, Swarm* swarm );
-
+        int _EscapedRoutine_CompareParticles( const void* _aParticleInfo, const void* _bParticleInfo );
 #endif 
 
diff -r f689df373a27 -r 1823810c6608 PopulationControl/tests/EscapedRoutineSuite.c
--- a/PopulationControl/tests/EscapedRoutineSuite.c	Tue Jan 26 12:39:41 2010 -0800
+++ b/PopulationControl/tests/EscapedRoutineSuite.c	Tue Jan 26 16:30:01 2010 -0800
@@ -116,7 +116,7 @@ void EscapedRoutineSuite_TestInitialiseP
    
    /* Fill the list with some initial random data */
    for ( pToRemove_I=0; pToRemove_I < data->escRoutine->particlesToRemoveAlloced; pToRemove_I++ ) {
-      data->escRoutine->particlesToRemoveList[pToRemove_I] == pToRemove_I*2;
+      data->escRoutine->particlesToRemoveList[pToRemove_I] = pToRemove_I*2;
    }
 
    EscapedRoutine_InitialiseParticleList( data->escRoutine );
@@ -167,7 +167,7 @@ void EscapedRoutineSuite_TestRemoveParti
    /* First set up the particles to remove list, and manually mark these */
    for ( pToRemove_I=0; pToRemove_I < pToRemoveCount; pToRemove_I++ ) {
       EscapedRoutine_SetParticleToRemove( data->escRoutine, data->swarm, pToRemoveList[pToRemove_I] );
-      ((Particle*)Swarm_ParticleAt( data->swarm, pToRemoveList[pToRemove_I] ))->toRemove == True; 
+      ((Particle*)Swarm_ParticleAt( data->swarm, pToRemoveList[pToRemove_I] ))->toRemove = True; 
    }
    pcu_check_true( data->escRoutine->particlesToRemoveCount == pToRemoveCount );
 
diff -r f689df373a27 -r 1823810c6608 Utils/src/DiffusionSMT.c
--- a/Utils/src/DiffusionSMT.c	Tue Jan 26 12:39:41 2010 -0800
+++ b/Utils/src/DiffusionSMT.c	Tue Jan 26 16:30:01 2010 -0800
@@ -160,7 +160,7 @@ void _DiffusionSMT_Build( void* matrixTe
     _StiffnessMatrixTerm_Build( self, data );
 
     /* Get Component Factory if we can */
-    context = self->context;
+    context = (AbstractContext*)(self->context);
     cf = context->CF;
 
     /* Sort out material extension stuff */