Mercurial > octave
diff libinterp/corefcn/pr-output.cc @ 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 | aba2e6293dd8 |
| children | f4d7d0eb5b0c |
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc Thu May 19 01:50:04 2016 -0400 +++ b/libinterp/corefcn/pr-output.cc Thu May 19 01:59:35 2016 -0400 @@ -1477,14 +1477,14 @@ // interrupted before resetting the format flags and fill // character? - oct_mach_info::float_format flt_fmt = - oct_mach_info::native_float_format (); + octave::mach_info::float_format flt_fmt = + octave::mach_info::native_float_format (); os.fill ('0'); os.flags (std::ios::right | std::ios::hex); if (hex_format > 1 - || flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian) + || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian) { for (size_t i = 0; i < sizeof (double); i++) os << std::setw (2) << static_cast<int> (tmp.i[i]); @@ -1500,10 +1500,10 @@ equiv tmp; tmp.d = d; - oct_mach_info::float_format flt_fmt = - oct_mach_info::native_float_format (); - - if (flt_fmt == oct_mach_info::flt_fmt_ieee_big_endian) + octave::mach_info::float_format flt_fmt = + octave::mach_info::native_float_format (); + + if (flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian) { for (size_t i = 0; i < sizeof (double); i++) PRINT_CHAR_BITS (os, tmp.i[i]); @@ -3011,7 +3011,7 @@ os.flags (std::ios::right | std::ios::hex); - if (hex_format > 1 || oct_mach_info::words_big_endian ()) + if (hex_format > 1 || octave::mach_info::words_big_endian ()) { for (size_t i = 0; i < sz; i++) os << std::setw (2) << static_cast<int> (tmpi[i]); @@ -3024,7 +3024,7 @@ } else if (bit_format) { - if (oct_mach_info::words_big_endian ()) + if (octave::mach_info::words_big_endian ()) { for (size_t i = 0; i < sz; i++) PRINT_CHAR_BITS (os, tmpi[i]);