comparison libinterp/octave-value/ov-str-mat.h @ 21739:c4ab2e54f100

use namespace for oct_mach_info class * mach-info.h, mach-info.cc: Put oct_mach_info in octave namespace and rename to mach_info. Change all uses.
author John W. Eaton <jwe@octave.org>
date Thu, 19 May 2016 01:59:35 -0400
parents 1473547f50f5
children 278fc29b69ca
comparison
equal deleted inserted replaced
21738:a99c2407f930 21739:c4ab2e54f100
153 bool load_ascii (std::istream& is); 153 bool load_ascii (std::istream& is);
154 154
155 bool save_binary (std::ostream& os, bool& save_as_floats); 155 bool save_binary (std::ostream& os, bool& save_as_floats);
156 156
157 bool load_binary (std::istream& is, bool swap, 157 bool load_binary (std::istream& is, bool swap,
158 oct_mach_info::float_format fmt); 158 octave::mach_info::float_format fmt);
159 159
160 bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats); 160 bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats);
161 161
162 bool load_hdf5 (octave_hdf5_id loc_id, const char *name); 162 bool load_hdf5 (octave_hdf5_id loc_id, const char *name);
163 163
164 int write (octave_stream& os, int block_size, 164 int write (octave_stream& os, int block_size,
165 oct_data_conv::data_type output_type, int skip, 165 oct_data_conv::data_type output_type, int skip,
166 oct_mach_info::float_format flt_fmt) const 166 octave::mach_info::float_format flt_fmt) const
167 { return os.write (matrix, block_size, output_type, skip, flt_fmt); } 167 { return os.write (matrix, block_size, output_type, skip, flt_fmt); }
168 168
169 protected: 169 protected:
170 170
171 octave_value do_index_op_internal (const octave_value_list& idx, 171 octave_value do_index_op_internal (const octave_value_list& idx,