Mercurial > octave
diff libinterp/octave-value/ov-class.cc @ 22028:5c949eecb6dd
use int64_t for octave_hdf5_id (bug #47858)
* oct-hdf5-types.h (octave_hdf5_id): Use int64_t.
* ls-hdf5.cc (check_hdf5_id_value): New static function.
* ls-hdf5.h, ls-hdf5.cc (hdf5_read_next_data_internal): Rename from
hdf5_read_next_data. Use HDF5 types directly.
(hdf5_read_next_data): Now a wrapper around
hdf5_read_next_data_internal. Use octave HDF5 types in the interface.
(hdf5_h5g_iterate): New function.
(read_hdf5_data): Pass hdf5_read_next_data_internal instead of
hdf5_read_next_data to H5Giterate.
* ov-cell.cc (octave_cell::load_hdf5): Call hdf5_h5g_iterate wrapper
function instead of calling H5giterate directly.
* ov-class.cc (octave_class::load_hdf5): Likewise.
* ov-fcn-handle.cc (octave_fcn_handle::load_hdf5): Likewise.
* ov-struct.cc (octave_struct::load_hdf5): Likewise.
author | Stefan Miereis <stefan.miereis@gmx.de> |
---|---|
date | Sat, 02 Jul 2016 10:19:44 -0400 |
parents | 278fc29b69ca |
children | 0f6fc2ec3b1a |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-class.cc Fri Jul 01 14:49:35 2016 -0400 +++ b/libinterp/octave-value/ov-class.cc Sat Jul 02 10:19:44 2016 -0400 @@ -1589,8 +1589,8 @@ H5Gclose (subgroup_hid); while (current_item < static_cast<int> (num_obj) - && (retval2 = H5Giterate (group_hid, name, ¤t_item, - hdf5_read_next_data, &dsub)) > 0) + && (retval2 = hdf5_h5g_iterate (group_hid, name, ¤t_item, + &dsub)) > 0) { octave_value t2 = dsub.tc;