Mercurial > hg > octave-nkf
diff src/ov-base-int.cc @ 9892:ac69e6f4b33d
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 | 829e69ec3110 |
line wrap: on
line diff
--- a/src/ov-base-int.cc +++ b/src/ov-base-int.cc @@ -350,9 +350,13 @@ space_hid = H5Screate_simple (rank, hdims, 0); if (space_hid < 0) return false; - +#if HAVE_HDF5_18 + data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, H5P_DEFAULT); +#endif if (data_hid < 0) { H5Sclose (space_hid); @@ -381,7 +385,11 @@ if (empty) return (empty > 0); +#if HAVE_HDF5_18 + hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); +#else hid_t data_hid = H5Dopen (loc_id, name); +#endif hid_t space_id = H5Dget_space (data_hid); hsize_t rank = H5Sget_simple_extent_ndims (space_id); @@ -540,8 +548,13 @@ space_hid = H5Screate_simple (0, dimens, 0); if (space_hid < 0) return false; +#if HAVE_HDF5_18 + data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, H5P_DEFAULT); +#endif if (data_hid < 0) { H5Sclose (space_hid); @@ -562,7 +575,11 @@ octave_base_int_scalar<T>::load_hdf5 (hid_t loc_id, const char *name) { hid_t save_type_hid = HDF5_SAVE_TYPE; +#if HAVE_HDF5_18 + hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); +#else hid_t data_hid = H5Dopen (loc_id, name); +#endif hid_t space_id = H5Dget_space (data_hid); hsize_t rank = H5Sget_simple_extent_ndims (space_id);