Mercurial > octave
diff libinterp/corefcn/cellfun.cc @ 28631:70cdf8de553d
move non-member octave_value operator functions to octave namespace
* ov.h, ov.cc (unary_op, binary_op, cat_op, colon_op): New functions
in octave namespace that replace do_unary_op, do_binary_op, do_cat_op,
and do_colon_op, respectively.
(do_unary_op, do_binary_op, do_cat_op, do_colon_op):
Deprecate global functions. Forward to corresponding new functions in
octave namespace.
* bsxfun.cc, cellfun.cc, data.cc, dot.cc, fft.cc, oct-stream.cc,
stack-frame.h, tril.cc, ov-base-diag.cc, ov-bool.cc, ov-class.cc,
ov-complex.cc, ov-float.cc, ov-flt-complex.cc, ov-intx.h,
ov-lazy-idx.h, ov-magic-int.cc, ov-perm.cc, ov-range.cc, ov-scalar.cc,
oct-lvalue.cc, oct-lvalue.h, pt-binop.cc, pt-cbinop.cc, pt-colon.cc,
pt-eval.cc, pt-tm-const.cc, pt-unop.cc: Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 30 Jul 2020 16:16:04 -0400 |
| parents | 7a8c69c4eb55 |
| children | 98192ec1621f |
line wrap: on
line diff
--- a/libinterp/corefcn/cellfun.cc Thu Jul 30 16:15:03 2020 -0400 +++ b/libinterp/corefcn/cellfun.cc Thu Jul 30 16:16:04 2020 -0400 @@ -1244,7 +1244,7 @@ for (int j = 0; j < nargin; j++) { if (mask[j]) - inputlist.xelem (j) = inputs[j].do_index_op (idx_list); + inputlist.xelem (j) = inputs[j].index_op (idx_list); } const octave_value_list tmp @@ -1336,7 +1336,7 @@ for (int j = 0; j < nargin; j++) { if (mask[j]) - inputlist.xelem (j) = inputs[j].do_index_op (idx_list); + inputlist.xelem (j) = inputs[j].index_op (idx_list); } const octave_value_list tmp @@ -2085,7 +2085,7 @@ for (int i = 0; i < nd; i++) ra_idx(i) = idx[i][ridx[i]]; - retval.xelem (j) = a.do_index_op (ra_idx); + retval.xelem (j) = a.index_op (ra_idx); rdv.increment_index (ridx); } @@ -2420,7 +2420,7 @@ for (octave_idx_type i = 0; i < n; i++) { idx(dim) = Range (lb(i), ub(i)); - retcell.xelem (i) = x.do_index_op (idx); + retcell.xelem (i) = x.index_op (idx); } } @@ -2471,7 +2471,7 @@ octave_value tmp = x(i); - y.xelem (i) = tmp.do_index_op (idx); + y.xelem (i) = tmp.index_op (idx); } return octave_value (y);