Mercurial > hg > octave-nkf

diff liboctave/array/Array.h @ 20439:5dfaaaae784f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate Array::capacity() and Sparse::capacity() for numel() and nzmax(). * liboctave/array/Array.h (Array::capacity): deprecate for ::numel(). * liboctave/array/Sparse.h (Sparse::capacity): deprecate for ::nzmax(). Also move comments into doxygen docs. * libinterp/corefcn/daspk.cc, libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc, libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/quad.cc, libinterp/corefcn/variables.cc, libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.h, libinterp/octave-value/ov.h, liboctave/array/Sparse.cc, liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc, liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc, liboctave/numeric/Quad.cc, liboctave/numeric/base-de.h, liboctave/numeric/base-min.h, liboctave/numeric/oct-rand.cc: replace use of capacity by numel() or nzmax() as appropriate.
author Carnë Draug <carandraug@octave.org>
date Sun, 24 May 2015 04:47:20 +0100
parents 00cf2847355d
children a9574e3c6e9e
line wrap: on
line diff
--- a/liboctave/array/Array.h
+++ b/liboctave/array/Array.h
@@ -253,11 +253,11 @@
   //@{
   //! Number of elements in the array.
   //! Synonymous with numel().
-  octave_idx_type capacity (void) const { return numel (); }
+  //! @note This method is deprecated in favour of numel().
+  GCC_ATTR_DEPRECATED octave_idx_type capacity (void) const { return numel (); }
 
   //! Number of elements in the array.
-  /*! Synonymous with capacity() and numel().
-
+  /*! Synonymous with numel().
       @note This method is deprecated in favour of numel().
 
       @note
@@ -269,12 +269,11 @@
   octave_idx_type length (void) const { return numel (); }
 
   //! Number of elements in the array.
-  //! Synonymous with capacity() and numel().
+  //! Synonymous with numel().
   //! @note This method is deprecated in favour of numel().
   GCC_ATTR_DEPRECATED octave_idx_type nelem (void) const { return numel (); }
 
   //! Number of elements in the array.
-  //! Synonymous with capacity().
   octave_idx_type numel (void) const { return slice_len; }
   //@}