Mercurial > octave
diff libinterp/octave-value/ov-uint16.cc @ 24224:ff81c6772664
avoid issue with link-time optimization
With link-time optimization, the value used for the HDF5 save type was
not working correctly for Octave int types. It seems that the
templated load and save functions were recognized as duplicates and
only one version was used, even though they needed to be different.
This patch attempts to avoid that.
* ov-base-int.h, ov-base-int.cc
(octave_base_int<T>::load_hdf5_internal): Rename from
octave_base_int<T>::load_hdf5. Pass HDF5 save type as arg.
(octave_base_int<T>::save_hdf5_internal): Rename from
octave_base_int<T>::save_hdf5. Pass HDF5 save type as arg.
* ov-intx.h (OCTAVE_VALUE_INT_MATRIX_T::load_hdf5,
OCTAVE_VALUE_INT_MATRIX_T::save_hdf5,
OCTAVE_VALUE_INT_SCALAR_T:load_hdf5,
OCTAVE_VALUE_INT_SCALAR_T:save_hdf5): New declarations.
* ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-uint16.cc,
ov-uint32.cc, ov-uint64.cc, ov-uint8.cc: Define load_hdf5 and
save_hdf5 functions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 09 Nov 2017 18:20:19 -0500 |
parents | 092078913d54 |
children | b8cb5a05955e |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-uint16.cc Thu Nov 09 21:07:42 2017 +0100 +++ b/libinterp/octave-value/ov-uint16.cc Thu Nov 09 18:20:19 2017 -0500 @@ -41,6 +41,9 @@ #if defined (HAVE_HDF5) # define HDF5_SAVE_TYPE H5T_NATIVE_UINT16 +#else +// This value will not be used. +# define HDF5_SAVE_TYPE 0 #endif #include "ov-base-int.h" @@ -66,9 +69,35 @@ DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint16_matrix, "uint16 matrix", "uint16"); +bool +octave_uint16_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name, + bool flag) +{ + return save_hdf5_internal (loc_id, HDF5_SAVE_TYPE, name, flag); +} + +bool +octave_uint16_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name) +{ + return load_hdf5_internal (loc_id, HDF5_SAVE_TYPE, name); +} + template class octave_base_scalar<octave_uint16>; template class octave_base_int_scalar<octave_uint16>; DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_uint16_scalar, "uint16 scalar", "uint16"); + +bool +octave_uint16_scalar::save_hdf5 (octave_hdf5_id loc_id, const char *name, + bool flag) +{ + return save_hdf5_internal (loc_id, HDF5_SAVE_TYPE, name, flag); +} + +bool +octave_uint16_scalar::load_hdf5 (octave_hdf5_id loc_id, const char *name) +{ + return load_hdf5_internal (loc_id, HDF5_SAVE_TYPE, name); +}