Mercurial > octave
diff liboctave/array/idx-vector.cc @ 28638:98192ec1621f
replace Range with range<double>
* __magick_read__.cc, cellfun.cc, data.cc, ls-mat4.cc, max.cc,
pr-output.cc, pr-output.h, rand.cc, tril.cc, xpow.cc, xpow.h,
ov-base.cc, ov-base.h, ov-range.cc, ov-range.h, ov.cc, ov.h,
jit-typeinfo.cc, jit-typeinfo.h, pt-eval.cc, pt-jit.cc, idx-vector.cc,
idx-vector.h: Replace all uses of Range with range<double>.
* Range.h: Deprecated Range constructors.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 06 Aug 2020 16:28:30 -0400 |
| parents | a3db48e66ef8 |
| children | 7854d5752dd2 |
line wrap: on
line diff
--- a/liboctave/array/idx-vector.cc Thu Aug 06 15:36:30 2020 -0400 +++ b/liboctave/array/idx-vector.cc Thu Aug 06 16:28:30 2020 -0400 @@ -132,7 +132,7 @@ octave::err_invalid_index (start + (len-1)*step); } -idx_vector::idx_range_rep::idx_range_rep (const Range& r) +idx_vector::idx_range_rep::idx_range_rep (const octave::range<double>& r) : idx_base_rep (), start (0), len (r.numel ()), step (1) { if (len < 0) @@ -207,11 +207,11 @@ return os; } -Range +octave::range<double> idx_vector::idx_range_rep::unconvert (void) const { - return Range (static_cast<double> (start+1), - static_cast<double> (step), len); + return octave::range<double>::make_n_element_range + (static_cast<double> (start+1), static_cast<double> (step), len); } Array<octave_idx_type> @@ -1226,7 +1226,7 @@ } void idx_vector::unconvert (idx_class_type& iclass, - double& scalar, Range& range, + double& scalar, octave::range<double>& range, Array<double>& array, Array<bool>& mask) const { iclass = idx_class ();