From 003cb6b186cbe441fc036b87d5b2330571b0ab69 Mon Sep 17 00:00:00 2001
From: tradke <schnetter@cct.lsu.edu>
Date: Wed, 23 Jan 2008 15:23:00 +0000
Subject: CarpetIOF5: set compatibility macros to use the new HDF5 1.8 API

CarpetIOF5 uses functions from the new HDF5 API. Some macros need to be set
in order to enable this new API also in HDF5 installations with HDF5 1.6.x
backwards compatibility.

darcs-hash:20080123152303-3fd61-cd1a81e9df48fbb370aa9fc205452737845ae727.gz
---
 CarpetDev/CarpetIOF5/src/data_region.hh |  6 ++++++
 CarpetDev/CarpetIOF5/src/utils.cc       |  2 --
 CarpetDev/CarpetIOF5/src/utils.hh       | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'CarpetDev')

diff --git a/CarpetDev/CarpetIOF5/src/data_region.hh b/CarpetDev/CarpetIOF5/src/data_region.hh
index d40a88e7e..29d5504c7 100644
--- a/CarpetDev/CarpetIOF5/src/data_region.hh
+++ b/CarpetDev/CarpetIOF5/src/data_region.hh
@@ -1,6 +1,12 @@
 #ifndef DATA_REGION_HH
 #define DATA_REGION_HH
 
+// force HDF5 1.8.x installations to use the new API
+#ifdef H5Dcreate_vers
+#undef H5Dcreate_vers
+#endif
+#define H5Dcreate_vers 2
+
 #include <hdf5.h>
 
 #include "bbox.hh"
diff --git a/CarpetDev/CarpetIOF5/src/utils.cc b/CarpetDev/CarpetIOF5/src/utils.cc
index b1efb21ed..b57e06a9e 100644
--- a/CarpetDev/CarpetIOF5/src/utils.cc
+++ b/CarpetDev/CarpetIOF5/src/utils.cc
@@ -3,8 +3,6 @@
 #include <cstring>
 #include <vector>
 
-#include <hdf5.h>
-
 #include "cctk.h"
 
 #include "defs.hh"
diff --git a/CarpetDev/CarpetIOF5/src/utils.hh b/CarpetDev/CarpetIOF5/src/utils.hh
index c379cc775..ae7cb65a1 100644
--- a/CarpetDev/CarpetIOF5/src/utils.hh
+++ b/CarpetDev/CarpetIOF5/src/utils.hh
@@ -1,6 +1,24 @@
 #ifndef UTILS_HH
 #define UTILS_HH
 
+// force HDF5 1.8.x installations to use the new API
+#ifdef H5Gopen_vers
+#undef H5Gopen_vers
+#endif
+#ifdef H5Gcreate_vers
+#undef H5Gcreate_vers
+#endif
+#ifdef H5Acreate_vers
+#undef H5Acreate_vers
+#endif
+#ifdef H5Tarray_create_vers
+#undef H5Tarray_create_vers
+#endif
+#define H5Gopen_vers 2
+#define H5Gcreate_vers 2
+#define H5Acreate_vers 2
+#define H5Tarray_create_vers 2
+
 #include <hdf5.h>
 
 #include "cctk.h"
-- 
cgit v1.2.3