Mercurial > octave
diff src/OPERATORS/op-fcs-fs.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/OPERATORS/op-fcs-fs.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/src/OPERATORS/op-fcs-fs.cc Thu Jan 20 17:24:59 2011 -0500 @@ -109,7 +109,7 @@ { CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); - return (v1.float_complex_value () != static_cast<float>(0.0) && + return (v1.float_complex_value () != static_cast<float>(0.0) && v2.float_value ()); } @@ -117,17 +117,17 @@ { CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); - return (v1.float_complex_value () != static_cast<float>(0.0) || + return (v1.float_complex_value () != static_cast<float>(0.0) || v2.float_value ()); } -DEFNDCATOP_FN (fcs_fs, float_complex, float_scalar, float_complex_array, +DEFNDCATOP_FN (fcs_fs, float_complex, float_scalar, float_complex_array, float_array, concat) -DEFNDCATOP_FN (cs_fs, complex, float_scalar, float_complex_array, +DEFNDCATOP_FN (cs_fs, complex, float_scalar, float_complex_array, float_array, concat) -DEFNDCATOP_FN (fcs_s, float_complex, scalar, float_complex_array, +DEFNDCATOP_FN (fcs_s, float_complex, scalar, float_complex_array, float_array, concat) void @@ -156,8 +156,8 @@ INSTALL_CATOP (octave_complex, octave_float_scalar, cs_fs); INSTALL_CATOP (octave_float_complex, octave_scalar, fcs_s); - INSTALL_ASSIGNCONV (octave_float_complex, octave_float_scalar, + INSTALL_ASSIGNCONV (octave_float_complex, octave_float_scalar, octave_float_complex_matrix); - INSTALL_ASSIGNCONV (octave_complex, octave_float_scalar, + INSTALL_ASSIGNCONV (octave_complex, octave_float_scalar, octave_complex_matrix); }