Mercurial > hg > octave-nkf

diff src/ov-struct.cc @ 9892:ac69e6f4b33d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
author Kacper Kowalik <xarthisius.kk@gmail.com>
date Tue, 01 Dec 2009 00:49:07 +0100
parents b3089dba88bf
children 83bb2a78c07d
line wrap: on
line diff
--- a/src/ov-struct.cc
+++ b/src/ov-struct.cc
@@ -1487,7 +1487,11 @@
 {
   hid_t data_hid = -1;
 
+#if HAVE_HDF5_18
+  data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+#else
   data_hid = H5Gcreate (loc_id, name, 0);
+#endif
   if (data_hid < 0) return false;
 
   // recursively add each element of the structure to this group
@@ -1528,7 +1532,11 @@
   Octave_map m (dim_vector (1, 1));
   int current_item = 0;
   hsize_t num_obj = 0;
-  hid_t group_id = H5Gopen (loc_id, name); 
+#if HAVE_HDF5_18
+  hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT);
+#else
+  hid_t group_id = H5Gopen (loc_id, name);
+#endif
   H5Gget_num_objs (group_id, &num_obj);
   H5Gclose (group_id);