Mercurial > octave
changeset 21777:d6826b38b29c
maint: Periodic merge of stable to default.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Wed, 25 May 2016 12:28:50 -0700 |
parents | 6cf6bc451eeb (current diff) 1e81dd035639 (diff) |
children | 895971cb50f0 |
files | libinterp/corefcn/oct-stream.cc |
diffstat | 1 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-stream.cc Wed May 25 09:35:37 2016 -0500 +++ b/libinterp/corefcn/oct-stream.cc Wed May 25 12:28:50 2016 -0700 @@ -6697,10 +6697,12 @@ { bool retval = true; - bool swap - = ((octave::mach_info::words_big_endian () - && flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian) - || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian); + bool swap = false; + + if (octave::mach_info::words_big_endian ()) + swap = (flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian); + else + swap = (flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian); bool do_float_conversion = flt_fmt != octave::mach_info::float_format (); @@ -6860,9 +6862,12 @@ octave_idx_type skip, octave::mach_info::float_format flt_fmt) { - bool swap = ((octave::mach_info::words_big_endian () - && flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian) - || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian); + bool swap = false; + + if (octave::mach_info::words_big_endian ()) + swap = (flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian); + else + swap = (flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian); bool do_data_conversion = (swap || ! is_equivalent_type<T> (output_type) || flt_fmt != octave::mach_info::float_format ());