Mercurial > octave

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 53728df3e4c9
children 0806871e3e1e
comparison
equal deleted inserted replaced
21738:a99c2407f930 21739:c4ab2e54f100
304 return idx_cache ? *idx_cache : set_idx_cache (idx_vector (matrix)); 304 return idx_cache ? *idx_cache : set_idx_cache (idx_vector (matrix));
305 } 305 }
306 306
307 int write (octave_stream& os, int block_size, 307 int write (octave_stream& os, int block_size,
308 oct_data_conv::data_type output_type, int skip, 308 oct_data_conv::data_type output_type, int skip,
309 oct_mach_info::float_format flt_fmt) const 309 octave::mach_info::float_format flt_fmt) const
310 { return os.write (matrix, block_size, output_type, skip, flt_fmt); } 310 { return os.write (matrix, block_size, output_type, skip, flt_fmt); }
311 311
312 // Unsafe. This function exists to support the MEX interface. 312 // Unsafe. This function exists to support the MEX interface.
313 // You should not use it anywhere else. 313 // You should not use it anywhere else.
314 void *mex_get_data (void) const { return matrix.mex_get_data (); } 314 void *mex_get_data (void) const { return matrix.mex_get_data (); }
612 612
613 idx_vector index_vector (bool /* require_integers */ = false) const { return idx_vector (scalar); } 613 idx_vector index_vector (bool /* require_integers */ = false) const { return idx_vector (scalar); }
614 614
615 int write (octave_stream& os, int block_size, 615 int write (octave_stream& os, int block_size,
616 oct_data_conv::data_type output_type, octave_idx_type skip, 616 oct_data_conv::data_type output_type, octave_idx_type skip,
617 oct_mach_info::float_format flt_fmt) const 617 octave::mach_info::float_format flt_fmt) const
618 { 618 {
619 return os.write (OCTAVE_VALUE_INT_NDARRAY_EXTRACTOR_FUNCTION (), 619 return os.write (OCTAVE_VALUE_INT_NDARRAY_EXTRACTOR_FUNCTION (),
620 block_size, output_type, skip, flt_fmt); 620 block_size, output_type, skip, flt_fmt);
621 } 621 }
622 622