Mercurial > jwe > octave
changeset 31141:cbfe8318566a
maint: use "s_" prefix for integer "hdf5_save_type" class variable.
* ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-uint16.cc,
ov-uint32.cc, ov-uint64.cc, ov-uint8.cc:
Use "s_" prefix for integer "hdf5_save_type" class variable.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 09 Jul 2022 14:37:57 -0700 |
parents | 05a64f60bc1e |
children | 6308ce73bdca |
files | libinterp/octave-value/ov-int16.cc libinterp/octave-value/ov-int32.cc libinterp/octave-value/ov-int64.cc libinterp/octave-value/ov-int8.cc libinterp/octave-value/ov-intx.h libinterp/octave-value/ov-uint16.cc libinterp/octave-value/ov-uint32.cc libinterp/octave-value/ov-uint64.cc libinterp/octave-value/ov-uint8.cc |
diffstat | 9 files changed, 22 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-int16.cc Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-int16.cc Sat Jul 09 14:37:57 2022 -0700 @@ -56,8 +56,8 @@ #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; +octave_hdf5_id octave_int16_matrix::s_hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_int16_scalar::s_hdf5_save_type = HDF5_SAVE_TYPE; // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members.
--- a/libinterp/octave-value/ov-int32.cc Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-int32.cc Sat Jul 09 14:37:57 2022 -0700 @@ -56,8 +56,8 @@ #include "ls-utils.h" #include "ls-hdf5.h" -octave_hdf5_id octave_int32_matrix::hdf5_save_type = HDF5_SAVE_TYPE; -octave_hdf5_id octave_int32_scalar::hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_int32_matrix::s_hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_int32_scalar::s_hdf5_save_type = HDF5_SAVE_TYPE; // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members.
--- a/libinterp/octave-value/ov-int64.cc Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-int64.cc Sat Jul 09 14:37:57 2022 -0700 @@ -56,8 +56,8 @@ #include "ls-utils.h" #include "ls-hdf5.h" -octave_hdf5_id octave_int64_matrix::hdf5_save_type = HDF5_SAVE_TYPE; -octave_hdf5_id octave_int64_scalar::hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_int64_matrix::s_hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_int64_scalar::s_hdf5_save_type = HDF5_SAVE_TYPE; // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members.
--- a/libinterp/octave-value/ov-int8.cc Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-int8.cc Sat Jul 09 14:37:57 2022 -0700 @@ -56,8 +56,8 @@ #include "ls-utils.h" #include "ls-hdf5.h" -octave_hdf5_id octave_int8_matrix::hdf5_save_type = HDF5_SAVE_TYPE; -octave_hdf5_id octave_int8_scalar::hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_int8_matrix::s_hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_int8_scalar::s_hdf5_save_type = HDF5_SAVE_TYPE; // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members.
--- a/libinterp/octave-value/ov-intx.h Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-intx.h Sat Jul 09 14:37:57 2022 -0700 @@ -370,17 +370,17 @@ bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool flag) { - return save_hdf5_internal (loc_id, hdf5_save_type, name, flag); + return save_hdf5_internal (loc_id, s_hdf5_save_type, name, flag); } bool load_hdf5 (octave_hdf5_id loc_id, const char *name) { - return load_hdf5_internal (loc_id, hdf5_save_type, name); + return load_hdf5_internal (loc_id, s_hdf5_save_type, name); } private: - static octave_hdf5_id hdf5_save_type; + static octave_hdf5_id s_hdf5_save_type; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; @@ -683,17 +683,17 @@ bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool flag) { - return save_hdf5_internal (loc_id, hdf5_save_type, name, flag); + return save_hdf5_internal (loc_id, s_hdf5_save_type, name, flag); } bool load_hdf5 (octave_hdf5_id loc_id, const char *name) { - return load_hdf5_internal (loc_id, hdf5_save_type, name); + return load_hdf5_internal (loc_id, s_hdf5_save_type, name); } private: - static octave_hdf5_id hdf5_save_type; + static octave_hdf5_id s_hdf5_save_type; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA };
--- a/libinterp/octave-value/ov-uint16.cc Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-uint16.cc Sat Jul 09 14:37:57 2022 -0700 @@ -57,8 +57,8 @@ #include "ls-utils.h" #include "ls-hdf5.h" -octave_hdf5_id octave_uint16_matrix::hdf5_save_type = HDF5_SAVE_TYPE; -octave_hdf5_id octave_uint16_scalar::hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_uint16_matrix::s_hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_uint16_scalar::s_hdf5_save_type = HDF5_SAVE_TYPE; // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members.
--- a/libinterp/octave-value/ov-uint32.cc Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-uint32.cc Sat Jul 09 14:37:57 2022 -0700 @@ -56,8 +56,8 @@ #include "ls-utils.h" #include "ls-hdf5.h" -octave_hdf5_id octave_uint32_matrix::hdf5_save_type = HDF5_SAVE_TYPE; -octave_hdf5_id octave_uint32_scalar::hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_uint32_matrix::s_hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_uint32_scalar::s_hdf5_save_type = HDF5_SAVE_TYPE; // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members.
--- a/libinterp/octave-value/ov-uint64.cc Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-uint64.cc Sat Jul 09 14:37:57 2022 -0700 @@ -56,8 +56,8 @@ #include "ls-utils.h" #include "ls-hdf5.h" -octave_hdf5_id octave_uint64_matrix::hdf5_save_type = HDF5_SAVE_TYPE; -octave_hdf5_id octave_uint64_scalar::hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_uint64_matrix::s_hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_uint64_scalar::s_hdf5_save_type = HDF5_SAVE_TYPE; // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members.
--- a/libinterp/octave-value/ov-uint8.cc Sat Jul 09 13:43:11 2022 -0700 +++ b/libinterp/octave-value/ov-uint8.cc Sat Jul 09 14:37:57 2022 -0700 @@ -56,8 +56,8 @@ #include "ls-utils.h" #include "ls-hdf5.h" -octave_hdf5_id octave_uint8_matrix::hdf5_save_type = HDF5_SAVE_TYPE; -octave_hdf5_id octave_uint8_scalar::hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_uint8_matrix::s_hdf5_save_type = HDF5_SAVE_TYPE; +octave_hdf5_id octave_uint8_scalar::s_hdf5_save_type = HDF5_SAVE_TYPE; // Prevent implicit instantiations on some systems (Windows, others?) // that can lead to duplicate definitions of static data members.