Mercurial > octave
diff src/ov-str-mat.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 | cd96d29c5efa |
line wrap: on
line diff
--- a/src/ov-str-mat.cc Mon Nov 30 14:32:10 2009 -0500 +++ b/src/ov-str-mat.cc Tue Dec 01 00:49:07 2009 +0100 @@ -561,9 +561,13 @@ space_hid = H5Screate_simple (rank, hdims, 0); if (space_hid < 0) return false; - +#if HAVE_HDF5_18 + data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid, + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_CHAR, space_hid, H5P_DEFAULT); +#endif if (data_hid < 0) { H5Sclose (space_hid); @@ -596,7 +600,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_hid = H5Dget_space (data_hid); hsize_t rank = H5Sget_simple_extent_ndims (space_hid); hid_t type_hid = H5Dget_type (data_hid);