Changeset 1755

Timestamp:

15/11/11 12:41:59 (6 months ago)

Author:

Freddie Akeroyd

Message:

Add in explict checks for HDF5 >= 1.8.0 Refs #303

File:

• trunk/src/napi5.c (modified) (3 diffs)

trunk/src/napi5.c

@@ -33 +33 @@
 #include "napi.h"
 #include "napi5.h"
+
+#if !H5_VERSION_GE(1,8,0)
+#error HDF5 Version must be 1.8.0 or higher
+#endif
 
 #define NX_UNKNOWN_GROUP "" /* for when no NX_class attr */
@@ -153 +157 @@
   size_t rdcc_nbytes;
   double rdcc_w0;
+  unsigned hdf5_majnum, hdf5_minnum, hdf5_relnum;
+
+  *pHandle = NULL;
+
+  if (H5get_libversion(&hdf5_majnum, &hdf5_minnum, &hdf5_relnum) < 0)
+  {
+      NXReportError("ERROR: cannot determine HDF5 library version");
+      return NX_ERROR;
+  }
+  if (hdf5_majnum == 1 && hdf5_minnum < 8)
+  {
+      NXReportError("ERROR: HDF5 library 1.8.0 or higher required");
+      return NX_ERROR;
+  }
 
   /* mask of any options for now */
@@ -163 +181 @@
 #endif 
 
-    *pHandle = NULL;
 
     pNew = (pNexusFile5) malloc (sizeof (NexusFile5));