Mercurial > octave
diff src/OPERATORS/op-fcs-fcs.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-fcs.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/src/OPERATORS/op-fcs-fcs.cc Thu Jan 20 17:24:59 2011 -0500 @@ -132,7 +132,7 @@ { CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_complex&); - return (v1.float_complex_value () != static_cast<float>(0.0) && + return (v1.float_complex_value () != static_cast<float>(0.0) && v2.float_complex_value () != static_cast<float>(0.0)); } @@ -140,17 +140,17 @@ { CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_complex&); - return (v1.float_complex_value () != static_cast<float>(0.0) || + return (v1.float_complex_value () != static_cast<float>(0.0) || v2.float_complex_value () != static_cast<float>(0.0)); } -DEFNDCATOP_FN (fcs_fcs, float_complex, float_complex, float_complex_array, +DEFNDCATOP_FN (fcs_fcs, float_complex, float_complex, float_complex_array, float_complex_array, concat) -DEFNDCATOP_FN (cs_fcs, complex, float_complex, float_complex_array, +DEFNDCATOP_FN (cs_fcs, complex, float_complex, float_complex_array, float_complex_array, concat) -DEFNDCATOP_FN (fcs_cs, float_complex, complex, float_complex_array, +DEFNDCATOP_FN (fcs_cs, float_complex, complex, float_complex_array, float_complex_array, concat) CONVDECL (float_complex_to_complex) @@ -203,6 +203,6 @@ INSTALL_ASSIGNCONV (octave_float_complex, octave_null_str, octave_float_complex_matrix); INSTALL_ASSIGNCONV (octave_float_complex, octave_null_sq_str, octave_float_complex_matrix); - INSTALL_CONVOP (octave_float_complex, octave_complex_matrix, + INSTALL_CONVOP (octave_float_complex, octave_complex_matrix, float_complex_to_complex); }