Mercurial > hg > octave-lyh

diff liboctave/fCMatrix.h @ 11570:57632dea2446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a83bad07f7e3
line wrap: on
line diff
--- a/liboctave/fCMatrix.h
+++ b/liboctave/fCMatrix.h
@@ -45,23 +45,29 @@
 
   FloatComplexMatrix (void) : MArray<FloatComplex> () { }
 
-  FloatComplexMatrix (octave_idx_type r, octave_idx_type c) : MArray<FloatComplex> (r, c) { }
+  FloatComplexMatrix (octave_idx_type r, octave_idx_type c)
+    : MArray<FloatComplex> (dim_vector (r, c)) { }
 
-  FloatComplexMatrix (octave_idx_type r, octave_idx_type c, const FloatComplex& val)
-    : MArray<FloatComplex> (r, c, val) { }
+  FloatComplexMatrix (octave_idx_type r, octave_idx_type c,
+                      const FloatComplex& val)
+    : MArray<FloatComplex> (dim_vector (r, c), val) { }
 
-  FloatComplexMatrix (const dim_vector& dv) : MArray<FloatComplex> (dv.redim (2)) { }
+  FloatComplexMatrix (const dim_vector& dv)
+    : MArray<FloatComplex> (dv.redim (2)) { }
 
   FloatComplexMatrix (const dim_vector& dv, const FloatComplex& val) 
     : MArray<FloatComplex> (dv.redim (2), val) { }
 
-  FloatComplexMatrix (const FloatComplexMatrix& a) : MArray<FloatComplex> (a) { }
+  FloatComplexMatrix (const FloatComplexMatrix& a)
+    : MArray<FloatComplex> (a) { }
 
   template <class U>
-  FloatComplexMatrix (const MArray<U>& a) : MArray<FloatComplex> (a.as_matrix ()) { }
+  FloatComplexMatrix (const MArray<U>& a)
+    : MArray<FloatComplex> (a.as_matrix ()) { }
 
   template <class U>
-  FloatComplexMatrix (const Array<U>& a) : MArray<FloatComplex> (a.as_matrix ()) { }
+  FloatComplexMatrix (const Array<U>& a)
+    : MArray<FloatComplex> (a.as_matrix ()) { }
 
   explicit FloatComplexMatrix (const FloatMatrix& a);