Mercurial > octave
diff libinterp/corefcn/cellfun.cc @ 23450:855122b993da
maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
* Canvas.cc, color-picker.cc, dialog.cc, marker.cc, main-window.cc, Cell.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, bsxfun.cc, call-stack.cc,
cellfun.cc, data.cc, defaults.cc, det.cc, eig.cc, error.cc, file-io.cc,
filter.cc, find.cc, gammainc.cc, gcd.cc, gl-render.cc, graphics.cc,
graphics.in.h, help.cc, hex2num.cc, inv.cc, load-save.cc, lookup.cc,
ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lu.cc, max.cc,
mex.cc, oct-hist.cc, oct-map.cc, oct-procbuf.cc, oct-stream.cc, pr-output.cc,
rand.cc, regexp.cc, schur.cc, str2double.cc, strfns.cc, symtab.cc, sysdep.cc,
tril.cc, variables.cc, xdiv.cc, audiodevinfo.cc, audioread.cc, colamd.cc,
gzip.cc, ov-base-diag.cc, ov-base-mat.h, ov-base-scalar.h, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-range.cc, ov-range.h, ov-struct.cc,
ov-usr-fcn.cc, ov.cc, octave.cc, op-class.cc, pt-eval.cc, pt-funcall.cc,
pt-idx.cc, pt-jit.cc, pt-stmt.cc, version.cc, Array-util.cc, Array.cc,
CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CSparse.cc, Range.cc, Sparse.cc,
chNDArray.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dSparse.cc,
dim-vector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fDiagMatrix.cc,
fMatrix.cc, fNDArray.cc, idx-vector.cc, idx-vector.h, Faddeeva.cc, DASPK.cc,
DASRT.cc, DASSL.cc, EIG.cc, fEIG.cc, gsvd.cc, lo-specfun.cc, oct-rand.cc,
qr.cc, qrp.cc, randgamma.cc, schur.cc, svd.cc, Sparse-diag-op-defs.h,
mx-inlines.cc, oct-env.cc, cmd-edit.cc, kpse.cc, oct-inttypes.h, oct-sort.cc:
Wrap tertiary operator in parentheses "(COND ? x : y)".
author | Rik <rik@octave.org> |
---|---|
date | Thu, 27 Apr 2017 17:33:10 -0700 |
parents | c763214a8260 |
children | 55916f99b8b6 |
line wrap: on
line diff
--- a/libinterp/corefcn/cellfun.cc Thu Apr 27 15:18:20 2017 -0700 +++ b/libinterp/corefcn/cellfun.cc Thu Apr 27 17:33:10 2017 -0700 @@ -1850,7 +1850,7 @@ for (octave_idx_type j = 0; j < d[i].numel (); j++) s += d[i](j); - octave_idx_type r = i < dv.ndims () ? dv(i) : 1; + octave_idx_type r = (i < dv.ndims () ? dv(i) : 1); if (s != r) error ("mat2cell: mismatch on dimension %d (%d != %d)", i+1, r, s); @@ -1864,7 +1864,7 @@ prepare_idx (container *idx, int idim, int nd, const Array<octave_idx_type>* d) { - octave_idx_type nidx = idim < nd ? d[idim].numel () : 1; + octave_idx_type nidx = (idim < nd ? d[idim].numel () : 1); if (nidx == 1) idx[0] = idx_vector::colon; else @@ -1894,7 +1894,7 @@ return retval; octave_idx_type nridx = d[0].numel (); - octave_idx_type ncidx = nd == 1 ? 1 : d[1].numel (); + octave_idx_type ncidx = (nd == 1 ? 1 : d[1].numel ()); retval.clear (nridx, ncidx); int ivec = -1;