Mercurial > hg > octave-nkf
diff liboctave/intNDArray.h @ 9732:b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 16 Oct 2009 13:12:31 +0200 |
| parents | 192d94cff6c1 |
| children | a5035bc7fbfb |
line wrap: on
line diff
--- a/liboctave/intNDArray.h +++ b/liboctave/intNDArray.h @@ -48,9 +48,6 @@ explicit intNDArray (const Array<U>& a) : MArrayN<T> (a) { } template <class U> - explicit intNDArray (const ArrayN<U>& a) : MArrayN<T> (a) { } - - template <class U> intNDArray (const MArrayN<U>& a) : MArrayN<T> (a) { } template <class U> @@ -81,14 +78,14 @@ boolNDArray any (int dim = -1) const; intNDArray max (int dim = 0) const; - intNDArray max (ArrayN<octave_idx_type>& index, int dim = 0) const; + intNDArray max (Array<octave_idx_type>& index, int dim = 0) const; intNDArray min (int dim = 0) const; - intNDArray min (ArrayN<octave_idx_type>& index, int dim = 0) const; + intNDArray min (Array<octave_idx_type>& index, int dim = 0) const; intNDArray cummax (int dim = 0) const; - intNDArray cummax (ArrayN<octave_idx_type>& index, int dim = 0) const; + intNDArray cummax (Array<octave_idx_type>& index, int dim = 0) const; intNDArray cummin (int dim = 0) const; - intNDArray cummin (ArrayN<octave_idx_type>& index, int dim = 0) const; + intNDArray cummin (Array<octave_idx_type>& index, int dim = 0) const; intNDArray sum (int dim) const; NDArray dsum (int dim) const;