Mercurial > hg > octave-nkf
diff liboctave/dNDArray.h @ 4902:bd043a433918
[project @ 2004-06-14 18:46:20 by jwe]
author | jwe |
---|---|
date | Mon, 14 Jun 2004 18:49:09 +0000 |
parents | 9f7ef92b50b0 |
children | c638c144d4da |
line wrap: on
line diff
--- a/liboctave/dNDArray.h +++ b/liboctave/dNDArray.h @@ -29,6 +29,7 @@ #include "MArrayN.h" #include "dMatrix.h" +#include "intNDArray.h" #include "mx-defs.h" #include "mx-op-defs.h" @@ -54,11 +55,8 @@ NDArray (const MArrayN<double>& a) : MArrayN<double> (a) { } - NDArray (const ArrayN<double>& a) : MArrayN<double> (a) { } - - explicit NDArray (const boolNDArray& a); - - explicit NDArray (const charNDArray& a); + template <class U> + explicit NDArray (const intNDArray<U>& a) : MArrayN<double> (a) { } NDArray& operator = (const NDArray& a) { @@ -109,7 +107,7 @@ Matrix matrix_value (void) const; - NDArray squeeze (void) const { return ArrayN<double>::squeeze (); } + NDArray squeeze (void) const { return MArrayN<double>::squeeze (); } static void increment_index (Array<int>& ra_idx, const dim_vector& dimensions,