[cig-commits] commit: Removing one of these const in func definition because it's causing warning for icc

Mercurial hg at geodynamics.org
Mon Feb 1 15:33:08 PST 2010


changeset:   742:427a033af921
branch:      pcu_rejig
parent:      740:d5e87dc3c55f
user:        JulianGiordani
date:        Wed Dec 16 11:12:08 2009 +1100
files:       Base/Foundation/src/ObjectList.c Base/Foundation/src/ObjectList.h
description:
Removing one of these const in func definition because it's causing warning for icc


diff -r d5e87dc3c55f -r 427a033af921 Base/Foundation/src/ObjectList.c
--- a/Base/Foundation/src/ObjectList.c	Tue Dec 15 14:18:57 2009 +1100
+++ b/Base/Foundation/src/ObjectList.c	Wed Dec 16 11:12:08 2009 +1100
@@ -512,14 +512,14 @@ Index Stg_ObjectList_Remove( void* objec
 	return self->_remove( self, reference, option );
 }
 
-Index Stg_ObjectList_GetIndex( void* objectList, const Name const toGet ) {
+Index Stg_ObjectList_GetIndex( void* objectList, const Name toGet ) {
 	Stg_ObjectList* self = (Stg_ObjectList*) objectList;
 
 	return self->_getIndex( self, toGet );
 }
 
 
-void* Stg_ObjectList_Get( void* objectList, const Name const objectName ) {
+void* Stg_ObjectList_Get( void* objectList, const Name objectName ) {
 	Stg_ObjectList* self = (Stg_ObjectList*) objectList;
 
 	return self->_get( self, objectName );
@@ -728,7 +728,7 @@ Index _Stg_ObjectList_Remove( void* name
 }
 
 
-Index _Stg_ObjectList_GetIndex( void* namedObjectList, const Name const toGet ) {
+Index _Stg_ObjectList_GetIndex( void* namedObjectList, const Name toGet ) {
 	Stg_ObjectList* self = (Stg_ObjectList*) namedObjectList;
 	Index objectIndex;
 	
@@ -744,7 +744,7 @@ Index _Stg_ObjectList_GetIndex( void* na
 }
 
 
-void* _Stg_ObjectList_Get( void* objectList, const Name const toGet ) {
+void* _Stg_ObjectList_Get( void* objectList, const Name toGet ) {
         Stg_ObjectList* self = (Stg_ObjectList*) objectList;
         Index objectIndex;
                                                                                                                                     
diff -r d5e87dc3c55f -r 427a033af921 Base/Foundation/src/ObjectList.h
--- a/Base/Foundation/src/ObjectList.h	Tue Dec 15 14:18:57 2009 +1100
+++ b/Base/Foundation/src/ObjectList.h	Wed Dec 16 11:12:08 2009 +1100
@@ -73,8 +73,8 @@
 	typedef Index (Stg_ObjectList_InsertBeforeFunction) ( void* objects,  Name reference, void* objectPtr );
 	typedef Index (Stg_ObjectList_InsertAfterFunction) ( void* objects,  Name reference, void* objectPtr );
 	typedef Index (Stg_ObjectList_RemoveFunction) ( void* objects,  Name reference, ReplacementOption option );
-	typedef Index (Stg_ObjectList_GetIndexFunction) ( void* objects, const Name const toGet );
-	typedef void* (Stg_ObjectList_GetFunction) ( void* objects, const Name const toGet );
+	typedef Index (Stg_ObjectList_GetIndexFunction) ( void* objects, const Name toGet );
+	typedef void* (Stg_ObjectList_GetFunction) ( void* objects, const Name toGet );
 	typedef void  (Stg_ObjectList_AllocMoreMemoryFunction) ( void* objects );
 	typedef void (Stg_ObjectList_InsertAtIndexFunction) ( void* objects, Index index, void* objectPtr );
 	typedef void (Stg_ObjectList_RemoveByIndexFunction) ( void* objects, Index index, ReplacementOption option );
@@ -331,10 +331,10 @@
 	Index Stg_ObjectList_Remove( void* objectList, Name reference, ReplacementOption option ) ;
 	
 	/** Find an object's index in the list, by name. Returns (unsigned)-1 if not found. */
-	Index Stg_ObjectList_GetIndex( void* objectList, const Name const toGet );
+	Index Stg_ObjectList_GetIndex( void* objectList, const Name toGet );
 	
 	/** Get an object's ptr from the list, by name. Returns NULL if not found. */
-	void* Stg_ObjectList_Get( void* objectList, const Name const toGet );
+	void* Stg_ObjectList_Get( void* objectList, const Name toGet );
 	
 	/** Deletes all the objects in the list. */
 	void Stg_ObjectList_DeleteAllObjects( void* objectList );



More information about the CIG-COMMITS mailing list