Mercurial > hg > octave-nkf
changeset 19522: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 | cbc838b3020c |
| children | eb20020f36b5 |
| files | libinterp/corefcn/kron.cc liboctave/array/Array.h liboctave/array/chNDArray.cc |
| diffstat | 3 files changed, 21 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/kron.cc +++ b/libinterp/corefcn/kron.cc @@ -138,7 +138,7 @@ octave_idx_type nb = b.rows (); const Array<octave_idx_type>& pa = a.col_perm_vec (); const Array<octave_idx_type>& pb = b.col_perm_vec (); - Array<octave_idx_type> res_perm (na * nb); + Array<octave_idx_type> res_perm (dim_vector (1, na * nb)); octave_idx_type rescol = 0; for (octave_idx_type i = 0; i < na; i++) {
--- a/liboctave/array/Array.h +++ b/liboctave/array/Array.h @@ -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 (); };
--- a/liboctave/array/chNDArray.cc +++ b/liboctave/array/chNDArray.cc @@ -40,36 +40,33 @@ charNDArray::charNDArray (char c) : Array<char> () { - octave_idx_type nc = 1; - octave_idx_type nr = 1; + octave_idx_type n = 1; - resize (nr, nc); + resize1 (n); - elem (0, 0) = c; + elem (0) = c; } charNDArray::charNDArray (const char *s) : Array<char> () { - octave_idx_type nc = s ? strlen (s) : 0; - octave_idx_type nr = s && nc > 0 ? 1 : 0; + octave_idx_type n = s ? strlen (s) : 0; - resize (nr, nc); + resize1 (n); - for (octave_idx_type i = 0; i < nc; i++) - elem (0, i) = s[i]; + for (octave_idx_type i = 0; i < n; i++) + elem (i) = s[i]; } charNDArray::charNDArray (const std::string& s) : Array<char> () { - octave_idx_type nc = s.length (); - octave_idx_type nr = nc > 0 ? 1 : 0; + octave_idx_type n = s.length (); - resize (nr, nc); + resize1 (n); - for (octave_idx_type i = 0; i < nc; i++) - elem (0, i) = s[i]; + for (octave_idx_type i = 0; i < n; i++) + elem (i) = s[i]; } charNDArray::charNDArray (const string_vector& s, char fill_value)