[cig-commits] commit: Fix some const void* bugs when compiling without hdf5

[Mercurial]

changeset:   609:fb639b696af8
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Fri May 13 11:57:27 2011 -0700
files:       Swarm/src/FileParticleLayout.cxx Swarm/src/FileParticleLayout.h
description:
Fix some const void* bugs when compiling without hdf5


diff -r 5f446b6d9117 -r fb639b696af8 Swarm/src/FileParticleLayout.cxx
--- a/Swarm/src/FileParticleLayout.cxx	Thu May 12 11:18:48 2011 -0700
+++ b/Swarm/src/FileParticleLayout.cxx	Fri May 13 11:57:27 2011 -0700
@@ -214,7 +214,7 @@ void _FileParticleLayout_SetInitialCount
 void _FileParticleLayout_SetInitialCounts( void* particleLayout, void* _swarm ) {
    FileParticleLayout*  self         = (FileParticleLayout*)particleLayout;
    Swarm*               swarm        = (Swarm*)_swarm;
-   Name                 filename     = self->filename;
+   char*                filename     = self->filename;
    
 #ifdef READ_HDF5
    hid_t                file;
diff -r 5f446b6d9117 -r fb639b696af8 Swarm/src/FileParticleLayout.h
--- a/Swarm/src/FileParticleLayout.h	Thu May 12 11:18:48 2011 -0700
+++ b/Swarm/src/FileParticleLayout.h	Fri May 13 11:57:27 2011 -0700
@@ -63,7 +63,7 @@
 	#define __FileParticleLayout \
 		__GlobalParticleLayout \
 		\
-		Name       filename;    \
+		char*       filename;    \
 		FILE*      file;        \
 		Stream*    errorStream; \
 		/** number of files previous checkpoint stored across */ \