Added missing include file "cctk.h" which define CCTK_FILEVERSION.

This closes PR CactusPUGHIO/1064.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5/trunk@136 4825ed28-b72c-4eae-9704-e50c059e567d

1 files changed, 8 insertions, 8 deletions

diff --git a/src/util/hdf5_convert_from_ieeeio.c b/src/util/hdf5_convert_from_ieeeio.c
index e00737a..c7d00d7 100644
--- a/src/util/hdf5_convert_from_ieeeio.c
+++ b/src/util/hdf5_convert_from_ieeeio.c
@@ -16,6 +16,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
+/* Cactus includes (defines CCTK_FILEVERSION) */
+#include "cctk.h"
+
 /* FlexIO includes */
 #include "IOProtos.h"
 #include "IEEEIO.h"
@@ -41,8 +44,6 @@ int main (int argc, char **argv)
   hid_t outfile, dataset, dataspace, attribute, attrDataspace, hdf5Datatype;
   hid_t hdf5String;
   hsize_t hdf5Dims [MAXDIM];
-  herr_t (*old_func) (void *);
-  void *old_client_data;
   int iteration, timelevel;
   char ieeeDatasetName [MAXNAMESIZE], hdf5DatasetName [2 * MAXNAMESIZE];
 
@@ -224,12 +225,11 @@ int main (int argc, char **argv)
 
       assert (attrDataspace >= 0);
 
-      /* turn off error handling during check
-               for an already existing attribute */
-      H5Eget_auto (&old_func, &old_client_data);
-      H5Eset_auto (NULL, NULL);
-      H5Adelete (dataset, attrName);
-      H5Eset_auto (old_func, old_client_data);
+      /* turn off error messages about an already existing attribute */
+      H5E_BEGIN_TRY
+      {
+        H5Adelete (dataset, attrName);
+      } H5E_END_TRY;
 
       attribute = H5Acreate (dataset, attrName, hdf5Datatype,
                              attrDataspace, H5P_DEFAULT);