Mercurial > hg > octave-nkf

comparison src/OPERATORS/op-fs-fcs.cc @ 11586:12df7854fa7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
117 CAST_BINOP_ARGS (const octave_float_scalar&, const octave_float_complex&); 117 CAST_BINOP_ARGS (const octave_float_scalar&, const octave_float_complex&);
118 118
119 return octave_value (v1.float_scalar_value () || (v2.float_complex_value () != static_cast<float>(0.0))); 119 return octave_value (v1.float_scalar_value () || (v2.float_complex_value () != static_cast<float>(0.0)));
120 } 120 }
121 121
122 DEFNDCATOP_FN (fs_fcs, float_scalar, float_complex, float_array, 122 DEFNDCATOP_FN (fs_fcs, float_scalar, float_complex, float_array,
123 float_complex_array, concat) 123 float_complex_array, concat)
124 124
125 DEFNDCATOP_FN (s_fcs, scalar, float_complex, float_array, 125 DEFNDCATOP_FN (s_fcs, scalar, float_complex, float_array,
126 float_complex_array, concat) 126 float_complex_array, concat)
127 127
128 DEFNDCATOP_FN (fs_cs, float_scalar, complex, float_array, 128 DEFNDCATOP_FN (fs_cs, float_scalar, complex, float_array,
129 float_complex_array, concat) 129 float_complex_array, concat)
130 130
131 void 131 void
132 install_fs_fcs_ops (void) 132 install_fs_fcs_ops (void)
133 { 133 {
152 152
153 INSTALL_CATOP (octave_float_scalar, octave_float_complex, fs_fcs); 153 INSTALL_CATOP (octave_float_scalar, octave_float_complex, fs_fcs);
154 INSTALL_CATOP (octave_scalar, octave_float_complex, s_fcs); 154 INSTALL_CATOP (octave_scalar, octave_float_complex, s_fcs);
155 INSTALL_CATOP (octave_float_scalar, octave_complex, fs_cs); 155 INSTALL_CATOP (octave_float_scalar, octave_complex, fs_cs);
156 156
157 INSTALL_ASSIGNCONV (octave_float_scalar, octave_float_complex, 157 INSTALL_ASSIGNCONV (octave_float_scalar, octave_float_complex,
158 octave_float_complex_matrix); 158 octave_float_complex_matrix);
159 INSTALL_ASSIGNCONV (octave_scalar, octave_float_complex, 159 INSTALL_ASSIGNCONV (octave_scalar, octave_float_complex,
160 octave_complex_matrix); 160 octave_complex_matrix);
161 } 161 }