Mercurial > hg > octave-nkf
diff liboctave/oct-norm.cc @ 11570:57632dea2446
attempt better backward compatibility for Array constructors
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 19 Jan 2011 17:55:56 -0500 |
| parents | fd0a3ac60b0e |
| children | 12df7854fa7c |
line wrap: on
line diff
--- a/liboctave/oct-norm.cc +++ b/liboctave/oct-norm.cc @@ -226,7 +226,7 @@ template <class T, class R, class ACC> void column_norms (const MArray<T>& m, MArray<R>& res, ACC acc) { - res = MArray<R> (1, m.columns ()); + res = MArray<R> (dim_vector (1, m.columns ())); for (octave_idx_type j = 0; j < m.columns (); j++) { ACC accj = acc; @@ -240,7 +240,7 @@ template <class T, class R, class ACC> void row_norms (const MArray<T>& m, MArray<R>& res, ACC acc) { - res = MArray<R> (m.rows (), 1); + res = MArray<R> (dim_vector (m.rows (), 1)); std::vector<ACC> acci (m.rows (), acc); for (octave_idx_type j = 0; j < m.columns (); j++) { @@ -256,7 +256,7 @@ template <class T, class R, class ACC> void column_norms (const MSparse<T>& m, MArray<R>& res, ACC acc) { - res = MArray<R> (1, m.columns ()); + res = MArray<R> (dim_vector (1, m.columns ())); for (octave_idx_type j = 0; j < m.columns (); j++) { ACC accj = acc; @@ -270,7 +270,7 @@ template <class T, class R, class ACC> void row_norms (const MSparse<T>& m, MArray<R>& res, ACC acc) { - res = MArray<R> (m.rows (), 1); + res = MArray<R> (dim_vector (m.rows (), 1)); std::vector<ACC> acci (m.rows (), acc); for (octave_idx_type j = 0; j < m.columns (); j++) {