Mercurial > hg > octave-nkf
diff src/ov-bool.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:24:59 -0500 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
line wrap: on
line diff
--- a/src/ov-bool.cc +++ b/src/ov-bool.cc @@ -83,22 +83,22 @@ return tmp.do_index_op (idx, resize_ok); } -octave_value +octave_value octave_bool::resize (const dim_vector& dv, bool fill) const -{ +{ if (fill) { - boolNDArray retval (dv, false); - if (dv.numel()) - retval(0) = scalar; - return retval; + boolNDArray retval (dv, false); + if (dv.numel()) + retval(0) = scalar; + return retval; } else { - boolNDArray retval (dv); - if (dv.numel()) - retval(0) = scalar; - return retval; + boolNDArray retval (dv); + if (dv.numel()) + retval(0) = scalar; + return retval; } } @@ -112,7 +112,7 @@ return octave_value (s, type); } -bool +bool octave_bool::save_ascii (std::ostream& os) { double d = double_value (); @@ -123,7 +123,7 @@ return true; } -bool +bool octave_bool::load_ascii (std::istream& is) { scalar = (octave_read_value<double> (is) != 0.); @@ -137,7 +137,7 @@ return true; } -bool +bool octave_bool::save_binary (std::ostream& os, bool& /* save_as_floats */) { char tmp = (scalar ? 1 : 0); @@ -146,7 +146,7 @@ return true; } -bool +bool octave_bool::load_binary (std::istream& is, bool /* swap */, oct_mach_info::float_format /* fmt */) { @@ -170,13 +170,13 @@ space_hid = H5Screate_simple (0, dimens, 0); if (space_hid < 0) return false; #if HAVE_HDF5_18 - data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, + data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else - data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, + data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, H5P_DEFAULT); #endif - if (data_hid < 0) + if (data_hid < 0) { H5Sclose (space_hid); return false; @@ -205,15 +205,15 @@ hsize_t rank = H5Sget_simple_extent_ndims (space_id); if (rank != 0) - { + { H5Dclose (data_hid); return false; } double dtmp; - if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, + if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &dtmp) < 0) - { + { H5Dclose (data_hid); return false; }