Mercurial > octave
diff src/ov-scalar.cc @ 10315:57a59eae83cc
untabify src C++ source files
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 11 Feb 2010 12:41:46 -0500 |
| parents | cd96d29c5efa |
| children | 59e34bcdff13 |
line wrap: on
line diff
--- a/src/ov-scalar.cc Thu Feb 11 12:23:32 2010 -0500 +++ b/src/ov-scalar.cc Thu Feb 11 12:41:46 2010 -0500 @@ -98,7 +98,7 @@ NDArray retval (dv, NDArray::resize_fill_value()); if (dv.numel ()) - retval(0) = scalar; + retval(0) = scalar; return retval; } @@ -107,7 +107,7 @@ NDArray retval (dv); if (dv.numel ()) - retval(0) = scalar; + retval(0) = scalar; return retval; } @@ -125,13 +125,13 @@ int ival = NINT (scalar); if (ival < 0 || ival > UCHAR_MAX) - { - // FIXME -- is there something better we could do? + { + // FIXME -- is there something better we could do? - ival = 0; + ival = 0; - ::warning ("range error for conversion to character value"); - } + ::warning ("range error for conversion to character value"); + } retval = octave_value (std::string (1, static_cast<char> (ival)), type); } @@ -177,7 +177,7 @@ bool octave_scalar::load_binary (std::istream& is, bool swap, - oct_mach_info::float_format fmt) + oct_mach_info::float_format fmt) { char tmp; if (! is.read (reinterpret_cast<char *> (&tmp), 1)) @@ -196,7 +196,7 @@ bool octave_scalar::save_hdf5 (hid_t loc_id, const char *name, - bool /* save_as_floats */) + bool /* save_as_floats */) { hsize_t dimens[3]; hid_t space_hid = -1, data_hid = -1; @@ -207,10 +207,10 @@ #if HAVE_HDF5_18 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, - H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, - H5P_DEFAULT); + H5P_DEFAULT); #endif if (data_hid < 0) { @@ -220,7 +220,7 @@ double tmp = double_value (); retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &tmp) >= 0; + H5P_DEFAULT, &tmp) >= 0; H5Dclose (data_hid); H5Sclose (space_hid); @@ -248,7 +248,7 @@ double dtmp; if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, - H5P_DEFAULT, &dtmp) < 0) + H5P_DEFAULT, &dtmp) < 0) { H5Dclose (data_hid); return false;