Mercurial > octave-nkf
view liboctave/array/Array-i.cc @ 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 |
line wrap: on
line source
/* Copyright (C) 1994-2015 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "oct-inttypes.h" // Instantiate Arrays of integer values. #include "Array.h" #include "Array.cc" #define INLINE_ASCENDING_SORT #define INLINE_DESCENDING_SORT #include "oct-sort.cc" template class OCTAVE_API octave_sort<int>; template class OCTAVE_API octave_sort<long>; #if defined (HAVE_LONG_LONG_INT) template class OCTAVE_API octave_sort<long long>; #endif INSTANTIATE_ARRAY (int, OCTAVE_API); INSTANTIATE_ARRAY (long, OCTAVE_API); #if defined (HAVE_LONG_LONG_INT) INSTANTIATE_ARRAY (long long, OCTAVE_API); #endif template class OCTAVE_API octave_sort<octave_int8>; template class OCTAVE_API octave_sort<octave_int16>; template class OCTAVE_API octave_sort<octave_int32>; template class OCTAVE_API octave_sort<octave_int64>; INSTANTIATE_ARRAY (octave_int8, OCTAVE_API); INSTANTIATE_ARRAY (octave_int16, OCTAVE_API); INSTANTIATE_ARRAY (octave_int32, OCTAVE_API); INSTANTIATE_ARRAY (octave_int64, OCTAVE_API); template class OCTAVE_API octave_sort<octave_uint8>; template class OCTAVE_API octave_sort<octave_uint16>; template class OCTAVE_API octave_sort<octave_uint32>; template class OCTAVE_API octave_sort<octave_uint64>; INSTANTIATE_ARRAY (octave_uint8, OCTAVE_API); INSTANTIATE_ARRAY (octave_uint16, OCTAVE_API); INSTANTIATE_ARRAY (octave_uint32, OCTAVE_API); INSTANTIATE_ARRAY (octave_uint64, OCTAVE_API); #include "DiagArray2.h" #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<int>;