[cig-commits] commit: Change List to LList to avoid problems with MPI's c++ bindings
Mercurial
hg at geodynamics.org
Mon Nov 5 10:12:30 PST 2012
changeset: 830:bebcdaa9d45c
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Mon Nov 05 10:12:01 2012 -0800
files: Base/Container/src/List.cxx Base/Container/src/List.h Base/Container/src/types.h Base/Container/tests/ListSuite.cxx
description:
Change List to LList to avoid problems with MPI's c++ bindings
diff -r 14b398a6b15d -r bebcdaa9d45c Base/Container/src/List.cxx
--- a/Base/Container/src/List.cxx Mon Apr 30 13:49:42 2012 -0700
+++ b/Base/Container/src/List.cxx Mon Nov 05 10:12:01 2012 -0800
@@ -49,9 +49,9 @@ const Type List_Type = "List";
** Constructors
*/
-List* List_New() {
+LList* List_New() {
/* Variables set in this function */
- SizeT _sizeOfSelf = sizeof(List);
+ SizeT _sizeOfSelf = sizeof(LList);
Type type = List_Type;
Stg_Class_DeleteFunction* _delete = _List_Delete;
Stg_Class_PrintFunction* _print = _List_Print;
@@ -60,12 +60,12 @@ List* List_New() {
return _List_New( LIST_PASSARGS );
}
-List* _List_New( LIST_DEFARGS ) {
- List* self;
+LList* _List_New( LIST_DEFARGS ) {
+ LList* self;
/* Allocate memory */
- assert( _sizeOfSelf >= sizeof(List) );
- self = (List*)_Stg_Class_New( STG_CLASS_PASSARGS );
+ assert( _sizeOfSelf >= sizeof(LList) );
+ self = (LList*)_Stg_Class_New( STG_CLASS_PASSARGS );
/* Virtual info */
@@ -75,7 +75,7 @@ List* _List_New( LIST_DEFARGS ) {
return self;
}
-void _List_Init( List* self ) {
+void _List_Init( LList* self ) {
self->nItems = 0;
self->items = NULL;
self->itemSize = 0;
@@ -89,7 +89,7 @@ void _List_Init( List* self ) {
*/
void _List_Delete( void* list ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
List_Destruct( self );
@@ -98,7 +98,7 @@ void _List_Delete( void* list ) {
}
void _List_Print( void* list, Stream* stream ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
/* Print parent */
Journal_Printf( stream, "List (ptr): (%p)\n", self );
@@ -111,7 +111,7 @@ void _List_Print( void* list, Stream* st
*/
void List_SetDelta( void* list, unsigned delta ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
assert( self );
assert( delta );
@@ -120,7 +120,7 @@ void List_SetDelta( void* list, unsigned
}
void List_SetItemSize( void* list, unsigned itemSize ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
assert( self );
assert( itemSize );
@@ -131,7 +131,7 @@ void List_SetItemSize( void* list, unsig
}
void List_Clear( void* list ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
assert( self );
@@ -141,7 +141,7 @@ void List_Clear( void* list ) {
}
void List_Insert( void* list, unsigned index, void* data ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
unsigned item_i;
assert( self );
@@ -163,7 +163,7 @@ void List_Insert( void* list, unsigned i
}
void List_Append( void* list, void* data ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
assert( self );
@@ -175,7 +175,7 @@ void List_Prepend( void* list, void* dat
}
void List_Remove( void* list, void* data ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
unsigned item_i;
assert( self );
@@ -198,7 +198,7 @@ void List_Remove( void* list, void* data
}
void* List_GetItem( void* list, unsigned index ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
assert( self );
assert( index < self->nItems );
@@ -207,7 +207,7 @@ void* List_GetItem( void* list, unsigned
}
unsigned List_GetSize( void* list ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
assert( self );
@@ -215,7 +215,7 @@ unsigned List_GetSize( void* list ) {
}
Bool List_Exists( void* list, void* data ) {
- List* self = (List*)list;
+ LList* self = (LList*)list;
unsigned item_i;
assert( self );
@@ -233,7 +233,7 @@ Bool List_Exists( void* list, void* data
** Private Functions
*/
-void List_Expand( List* self ) {
+void List_Expand( LList* self ) {
self->maxItems += self->delta;
if( !self->items )
self->items = (Stg_Byte*)Memory_Alloc_Array_Bytes( self->itemSize, self->maxItems, "", "List::items" );
@@ -241,7 +241,7 @@ void List_Expand( List* self ) {
self->items = (Stg_Byte*)Memory_Realloc_Array_Bytes( self->items, self->itemSize, self->maxItems );
}
-void List_Contract( List* self ) {
+void List_Contract( LList* self ) {
if( self->delta > self->maxItems )
self->maxItems = 0;
else
@@ -253,7 +253,7 @@ void List_Contract( List* self ) {
self->items = (Stg_Byte*)Memory_Realloc_Array_Bytes( self->items, self->itemSize, self->maxItems );
}
-void List_Destruct( List* self ) {
+void List_Destruct( LList* self ) {
self->nItems = 0;
KillArray( self->items );
self->itemSize = 0;
diff -r 14b398a6b15d -r bebcdaa9d45c Base/Container/src/List.h
--- a/Base/Container/src/List.h Mon Apr 30 13:49:42 2012 -0700
+++ b/Base/Container/src/List.h Mon Nov 05 10:12:01 2012 -0800
@@ -60,7 +60,7 @@
unsigned maxItems; \
unsigned delta;
- struct List { __List };
+ struct LList { __List };
/*--------------------------------------------------------------------------------------------------------------------------
** Constructors
@@ -79,9 +79,9 @@
#define LIST_PASSARGS \
STG_CLASS_PASSARGS
- List* List_New();
- List* _List_New( LIST_DEFARGS );
- void _List_Init( List* self );
+ LList* List_New();
+ LList* _List_New( LIST_DEFARGS );
+ void _List_Init( LList* self );
/*--------------------------------------------------------------------------------------------------------------------------
** Virtual functions
@@ -114,9 +114,9 @@
** Private Member functions
*/
- void List_Expand( List* self );
- void List_Contract( List* self );
- void List_Destruct( List* self );
+ void List_Expand( LList* self );
+ void List_Contract( LList* self );
+ void List_Destruct( LList* self );
#endif /* __StGermain_Base_Container_List_h__ */
diff -r 14b398a6b15d -r bebcdaa9d45c Base/Container/src/types.h
--- a/Base/Container/src/types.h Mon Apr 30 13:49:42 2012 -0700
+++ b/Base/Container/src/types.h Mon Nov 05 10:12:01 2012 -0800
@@ -82,7 +82,7 @@ struct IMapItem {
typedef struct IndexSet IndexSet;
typedef struct PtrMap PtrMap;
typedef struct IndexMap IndexMap;
- typedef struct List List;
+ typedef struct LList LList;
typedef struct Hasher Hasher;
typedef struct NumberHasher NumberHasher;
typedef struct Mapping Mapping;
diff -r 14b398a6b15d -r bebcdaa9d45c Base/Container/tests/ListSuite.cxx
--- a/Base/Container/tests/ListSuite.cxx Mon Apr 30 13:49:42 2012 -0700
+++ b/Base/Container/tests/ListSuite.cxx Mon Nov 05 10:12:01 2012 -0800
@@ -41,7 +41,7 @@
#define NUM_ITEMS 100
typedef struct {
- List* list;
+ LList* list;
int arrayData[NUM_ITEMS];
} ListSuiteData;
More information about the CIG-COMMITS
mailing list