Mercurial > octave
diff src/ov-flt-complex.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-flt-complex.cc Mon Nov 30 14:32:10 2009 -0500 +++ b/src/ov-flt-complex.cc Tue Dec 01 00:49:07 2009 +0100 @@ -305,8 +305,12 @@ H5Sclose (space_hid); return false; } - +#if HAVE_HDF5_18 + data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); +#else data_hid = H5Dcreate (loc_id, name, type_hid, space_hid, H5P_DEFAULT); +#endif if (data_hid < 0) { H5Sclose (space_hid); @@ -329,7 +333,11 @@ octave_float_complex::load_hdf5 (hid_t loc_id, const char *name) { bool retval = false; +#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 type_hid = H5Dget_type (data_hid); hid_t complex_type = hdf5_make_complex_type (H5T_NATIVE_FLOAT);