Mercurial > hg > octave-shane
changeset 10673:b17a966099ed
remove deprecated Array method
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Tue, 01 Jun 2010 12:29:01 +0200 |
parents | 1cd7c39a96ee |
children | e3064439d6b4 |
files | liboctave/Array.cc liboctave/Array.h liboctave/ChangeLog |
diffstat | 3 files changed, 6 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.cc +++ b/liboctave/Array.cc @@ -1670,35 +1670,6 @@ return slice_data; } -template <class T> -void -Array<T>::maybe_delete_dims (void) -{ - int nd = dimensions.length (); - - dim_vector new_dims (1, 1); - - bool delete_dims = true; - - for (int i = nd - 1; i >= 0; i--) - { - if (delete_dims) - { - if (dimensions(i) != 1) - { - delete_dims = false; - - new_dims = dim_vector (i + 1, dimensions(i)); - } - } - else - new_dims(i) = dimensions(i); - } - - if (nd != new_dims.length ()) - dimensions = new_dims; -} - // Non-real types don't have NaNs. template <class T> inline bool
--- a/liboctave/Array.h +++ b/liboctave/Array.h @@ -459,8 +459,6 @@ int ndims (void) const { return dimensions.length (); } - void maybe_delete_dims (void); - // Indexing without resizing. Array<T> index (const idx_vector& i) const;
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,9 @@ +2010-06-01 Jaroslav Hajek <highegg@gmail.com> + + * Array.cc (Array<T>::maybe_delete_dims): Remove method (makes no + longer sense). + * Array.h: Update decls. + 2010-05-20 Jaroslav Hajek <highegg@gmail.com> * dim-vector.h (dim_vector::compute_index (const octave_idx_type *,