Mercurial > jwe > octave
comparison libinterp/octave-value/ov-str-mat.cc @ 21120:499b851fbfae
Replace pattern if/err_XXX/else/code with if/err_XXX/ code.
* schur.cc, ov-complex.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.h,
ov-flt-complex.h, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-range.cc,
ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.h, ov-str-mat.cc, ops.h, pt-idx.cc,
Array.cc, CColVector.cc, CMatrix.cc, CRowVector.cc, MSparse.cc, PermMatrix.cc,
Sparse.cc, dColVector.cc, dMatrix.cc, dRowVector.cc, dSparse.cc,
fCColVector.cc, fCMatrix.cc, fCRowVector.cc, fColVector.cc, fMatrix.cc,
fRowVector.cc:
Replace pattern if/err_XXX/else/code with if/err_XXX/ code.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 20 Jan 2016 16:58:59 -0800 |
parents | dfcb9d74b253 |
children | 95f8c8cdbffe |
comparison
equal
deleted
inserted
replaced
21119:90cd0f9442d5 | 21120:499b851fbfae |
---|---|
163 #define CHAR_MATRIX_CONV(T, INIT, TNAME, FCN) \ | 163 #define CHAR_MATRIX_CONV(T, INIT, TNAME, FCN) \ |
164 T retval INIT; \ | 164 T retval INIT; \ |
165 \ | 165 \ |
166 if (! force_string_conv) \ | 166 if (! force_string_conv) \ |
167 err_invalid_conversion ("string", TNAME); \ | 167 err_invalid_conversion ("string", TNAME); \ |
168 else \ | |
169 { \ | |
170 warning_with_id ("Octave:str-to-num", \ | |
171 "implicit conversion from %s to %s", \ | |
172 "string", TNAME); \ | |
173 \ | 168 \ |
174 retval = octave_char_matrix::FCN (); \ | 169 warning_with_id ("Octave:str-to-num", \ |
175 } \ | 170 "implicit conversion from %s to %s", \ |
171 "string", TNAME); \ | |
172 \ | |
173 retval = octave_char_matrix::FCN (); \ | |
176 \ | 174 \ |
177 return retval | 175 return retval |
178 | 176 |
179 double | 177 double |
180 octave_char_matrix_str::double_value (bool force_string_conv) const | 178 octave_char_matrix_str::double_value (bool force_string_conv) const |