Mercurial > octave

diff libinterp/octave-value/ov-int16.cc @ 24225:b8cb5a05955e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-int16.cc	Thu Nov 09 18:20:19 2017 -0500
+++ b/libinterp/octave-value/ov-int16.cc	Fri Nov 10 14:54:36 2017 -0500
@@ -56,6 +56,9 @@
 #include "ls-utils.h"
 #include "ls-hdf5.h"
 
+octave_hdf5_id octave_int16_matrix::hdf5_save_type = HDF5_SAVE_TYPE;
+octave_hdf5_id octave_int16_scalar::hdf5_save_type = HDF5_SAVE_TYPE;
+
 // Prevent implicit instantiations on some systems (Windows, others?)
 // that can lead to duplicate definitions of static data members.
 
@@ -68,36 +71,9 @@
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int16_matrix,
                                      "int16 matrix", "int16");
 
-
-bool
-octave_int16_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_int16_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_int16>;
 
 template class octave_base_int_scalar<octave_int16>;
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_int16_scalar,
                                      "int16 scalar", "int16");
-
-bool
-octave_int16_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_int16_scalar::load_hdf5 (octave_hdf5_id loc_id, const char *name)
-{
-  return load_hdf5_internal (loc_id, HDF5_SAVE_TYPE, name);
-}