Mercurial > octave
diff libinterp/octave-value/ov-intx.h @ 24225:b8cb5a05955e
improve on lto fix made in changeset ff81c6772664
* ov-intx.h (OCTAVE_VALUE_INT_MATRIX_T::hdf5_save_type,
OCTAVE_VALUE_INT_MATRIX_T::hdf5_save_type,
OCTAVE_VALUE_INT_MATRIX_T::hdf5_save_type,
OCTAVE_VALUE_INT_MATRIX_T::hdf5_save_type):
New static data members.
* ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-uint16.cc,
ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Initialize new static data
members. Don't define load_hdf5 and save_hdf5.
* ov-intx.h (OCTAVE_VALUE_INT_MATRIX_T::save_hdf5,
OCTAVE_VALUE_INT_MATRIX_T::load_hdf5,
OCTAVE_VALUE_INT_MATRIX_T::save_hdf5,
OCTAVE_VALUE_INT_MATRIX_T::load_hdf5): Use new static hdf5_save_type
and forward to internal functions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 10 Nov 2017 14:54:36 -0500 |
| parents | ff81c6772664 |
| children | 194eb4bd202b |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-intx.h Thu Nov 09 18:20:19 2017 -0500 +++ b/libinterp/octave-value/ov-intx.h Fri Nov 10 14:54:36 2017 -0500 @@ -369,12 +369,20 @@ } } - bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool flag); + bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool flag) + { + return save_hdf5_internal (loc_id, hdf5_save_type, name, flag); + } - bool load_hdf5 (octave_hdf5_id loc_id, const char *name); + bool load_hdf5 (octave_hdf5_id loc_id, const char *name) + { + return load_hdf5_internal (loc_id, hdf5_save_type, name); + } private: + static octave_hdf5_id hdf5_save_type; + DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; @@ -676,11 +684,19 @@ } } - bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool flag); + bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool flag) + { + return save_hdf5_internal (loc_id, hdf5_save_type, name, flag); + } - bool load_hdf5 (octave_hdf5_id loc_id, const char *name); + bool load_hdf5 (octave_hdf5_id loc_id, const char *name) + { + return load_hdf5_internal (loc_id, hdf5_save_type, name); + } - private: +private: + + static octave_hdf5_id hdf5_save_type; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };