Mercurial > hg > octave-nkf
diff src/OPERATORS/op-fs-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-fs-fcs.cc +++ b/src/OPERATORS/op-fs-fcs.cc @@ -119,13 +119,13 @@ return octave_value (v1.float_scalar_value () || (v2.float_complex_value () != static_cast<float>(0.0))); } -DEFNDCATOP_FN (fs_fcs, float_scalar, float_complex, float_array, +DEFNDCATOP_FN (fs_fcs, float_scalar, float_complex, float_array, float_complex_array, concat) -DEFNDCATOP_FN (s_fcs, scalar, float_complex, float_array, +DEFNDCATOP_FN (s_fcs, scalar, float_complex, float_array, float_complex_array, concat) -DEFNDCATOP_FN (fs_cs, float_scalar, complex, float_array, +DEFNDCATOP_FN (fs_cs, float_scalar, complex, float_array, float_complex_array, concat) void @@ -154,8 +154,8 @@ INSTALL_CATOP (octave_scalar, octave_float_complex, s_fcs); INSTALL_CATOP (octave_float_scalar, octave_complex, fs_cs); - INSTALL_ASSIGNCONV (octave_float_scalar, octave_float_complex, + INSTALL_ASSIGNCONV (octave_float_scalar, octave_float_complex, octave_float_complex_matrix); - INSTALL_ASSIGNCONV (octave_scalar, octave_float_complex, + INSTALL_ASSIGNCONV (octave_scalar, octave_float_complex, octave_complex_matrix); }