Mercurial > octave
diff liboctave/array/Array.h @ 19330:1f4455ff2329
Remove deprecated methods in liboctave.
* chNDArray.cc: Avoid using deprecated methods in constructors.
* Array.h: Documentation improved. Deprecated methods removed.
* kron.cc (kron): Use undeprecated constructor.
| author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
|---|---|
| date | Tue, 11 Nov 2014 12:31:36 +0100 |
| parents | 5b263e517c95 |
| children | af41e41ad28e |
line wrap: on
line diff
--- a/liboctave/array/Array.h Wed Nov 12 20:04:52 2014 -0800 +++ b/liboctave/array/Array.h Tue Nov 11 12:31:36 2014 +0100 @@ -41,9 +41,7 @@ #include "oct-mem.h" #include "oct-refcount.h" -//! One dimensional array class. Handles the reference counting for -//! all the derived classes. - +//!Handles the reference counting for all the derived classes. template <class T> class Array @@ -291,7 +289,7 @@ } //! @name First dimension - //! + //! //! Get the first dimension of the array (number of rows) //@{ octave_idx_type dim1 (void) const { return dimensions(0); } @@ -308,7 +306,7 @@ //@} //! @name Third dimension - //! + //! //! Get the third dimension of the array (number of pages) //@{ octave_idx_type dim3 (void) const { return dimensions(2); } @@ -484,22 +482,15 @@ //@{ //! Resizing (with fill). - void resize1 (octave_idx_type n, const T& rfv); - void resize1 (octave_idx_type n) { resize1 (n, resize_fill_value ()); } - - void resize (octave_idx_type n) GCC_ATTR_DEPRECATED { resize1 (n); } - - void resize (octave_idx_type nr, octave_idx_type nc, - const T& rfv) GCC_ATTR_DEPRECATED - { - resize2 (nr, nc, rfv); - } - - void resize (octave_idx_type nr, octave_idx_type nc) GCC_ATTR_DEPRECATED + void resize2 (octave_idx_type nr, octave_idx_type nc, const T& rfv); + void resize2 (octave_idx_type nr, octave_idx_type nc) { resize2 (nr, nc, resize_fill_value ()); } + void resize1 (octave_idx_type n, const T& rfv); + void resize1 (octave_idx_type n) { resize1 (n, resize_fill_value ()); } + void resize (const dim_vector& dv, const T& rfv); void resize (const dim_vector& dv) { resize (dv, resize_fill_value ()); } //@} @@ -730,7 +721,7 @@ //@{ //! WARNING: Only call these functions from jit - + int *jit_ref_count (void) { return rep->count.get (); } T *jit_slice_data (void) const { return slice_data; } @@ -741,13 +732,6 @@ //@} private: - - void resize2 (octave_idx_type nr, octave_idx_type nc, const T& rfv); - void resize2 (octave_idx_type nr, octave_idx_type nc) - { - resize2 (nr, nc, resize_fill_value ()); - } - static void instantiation_guard (); };