Mercurial > octave-nkf
comparison libinterp/octave-value/ov-base-diag.cc @ 20587:f90c8372b7ba
eliminate many more simple uses of error_state
* Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc,
det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc,
gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc,
levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc,
lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc,
pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc,
strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc,
tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc,
__osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc,
symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc,
ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc,
ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc,
ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc,
pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc,
pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 05 Oct 2015 19:29:36 -0400 |
| parents | dd6345fd8a97 |
| children |
comparison
equal
deleted
inserted
replaced
| 20586:b7ac1e94266e | 20587:f90c8372b7ba |
|---|---|
| 169 try | 169 try |
| 170 { | 170 { |
| 171 idx_vector i0 = jdx(0).index_vector (); | 171 idx_vector i0 = jdx(0).index_vector (); |
| 172 k = 1; | 172 k = 1; |
| 173 idx_vector i1 = jdx(1).index_vector (); | 173 idx_vector i1 = jdx(1).index_vector (); |
| 174 if (! error_state && i0(0) == i1(0) | 174 if (i0(0) == i1(0) |
| 175 && i0(0) < matrix.rows () && i1(0) < matrix.cols () | 175 && i0(0) < matrix.rows () && i1(0) < matrix.cols () |
| 176 && chk_valid_scalar (rhs, val)) | 176 && chk_valid_scalar (rhs, val)) |
| 177 { | 177 { |
| 178 matrix.dgelem (i0(0)) = val; | 178 matrix.dgelem (i0(0)) = val; |
| 179 retval = this; | 179 retval = this; |
| 188 e.set_pos_if_unset (2, k+1); | 188 e.set_pos_if_unset (2, k+1); |
| 189 throw; | 189 throw; |
| 190 } | 190 } |
| 191 } | 191 } |
| 192 | 192 |
| 193 if (! error_state && ! retval.is_defined ()) | 193 if (! retval.is_defined ()) |
| 194 retval = numeric_assign (type, idx, rhs); | 194 retval = numeric_assign (type, idx, rhs); |
| 195 } | 195 } |
| 196 else | 196 else |
| 197 { | 197 { |
| 198 std::string nm = type_name (); | 198 std::string nm = type_name (); |