Mercurial > octave-nkf
comparison liboctave/array/Sparse.h @ 20263:00cf2847355d
Deprecate Array::nelem() and Range::nelem() in favour of ::numel().
* liboctave/array/Array.h (Array::nelem) deprecate in favour of numel().
(Array::capacity, Array:: length): change to call numel() directly. These
methods will be deprecated soon.
* liboctave/array/PermMatrix.h (PermMatrix::nelem): deprecate in favour of
numel().
* liboctave/array/Range.h (Range::numel) new method to replace nelem().
(Range::nelem) deprecate in favour of the new method numel.
* liboctave/array/Sparse.h (Sparse::nelem) deprecate in favour of nzmax().
This one is secially bad because unlike the other classes, it is different
from numel().
* libinterp/corefcn/debug.cc, libinterp/corefcn/jit-typeinfo.cc,
libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/lu.cc,
libinterp/corefcn/luinc.cc, libinterp/corefcn/max.cc,
libinterp/corefcn/pr-output.cc, libinterp/corefcn/rand.cc,
libinterp/corefcn/xpow.cc, libinterp/dldfcn/__magick_read__.cc,
libinterp/dldfcn/audioread.cc, libinterp/octave-value/ov-base-int.cc,
libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-flt-re-mat.cc,
libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-range.cc,
libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-mat.cc,
libinterp/parse-tree/pt-eval.cc, liboctave/array/Array.cc,
liboctave/array/CNDArray.cc, liboctave/array/Range.cc,
liboctave/array/dNDArray.cc, liboctave/array/fCNDArray.cc,
liboctave/array/fNDArray.cc, liboctave/array/idx-vector.cc,
liboctave/array/intNDArray.cc, liboctave/numeric/SparseCmplxLU.cc,
liboctave/numeric/SparsedbleLU.cc: replace use of nelem() with numel().
| author | Carnë Draug <carandraug@octave.org> |
|---|---|
| date | Sun, 24 May 2015 02:41:37 +0100 |
| parents | 4197fc428c7d |
| children | 5dfaaaae784f |
comparison
equal
deleted
inserted
replaced
| 20262:9f484edd8767 | 20263:00cf2847355d |
|---|---|
| 252 octave_idx_type numel (void) const | 252 octave_idx_type numel (void) const |
| 253 { | 253 { |
| 254 return dimensions.safe_numel (); | 254 return dimensions.safe_numel (); |
| 255 } | 255 } |
| 256 | 256 |
| 257 octave_idx_type nelem (void) const { return capacity (); } | 257 GCC_ATTR_DEPRECATED octave_idx_type nelem (void) const { return capacity (); } |
| 258 octave_idx_type length (void) const { return numel (); } | 258 octave_idx_type length (void) const { return numel (); } |
| 259 | 259 |
| 260 octave_idx_type dim1 (void) const { return dimensions(0); } | 260 octave_idx_type dim1 (void) const { return dimensions(0); } |
| 261 octave_idx_type dim2 (void) const { return dimensions(1); } | 261 octave_idx_type dim2 (void) const { return dimensions(1); } |
| 262 | 262 |