Mercurial > hg > octave-nkf

diff liboctave/fCColVector.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/fCColVector.h
+++ b/liboctave/fCColVector.h
@@ -37,20 +37,26 @@
 
 public:
 
-  FloatComplexColumnVector (void) : MArray<FloatComplex> (0, 1) { }
+ FloatComplexColumnVector (void)
+   : MArray<FloatComplex> (dim_vector (0, 1)) { }
 
-  explicit FloatComplexColumnVector (octave_idx_type n) : MArray<FloatComplex> (n, 1) { }
+  explicit FloatComplexColumnVector (octave_idx_type n)
+    : MArray<FloatComplex> (dim_vector (n, 1)) { }
 
   explicit FloatComplexColumnVector (const dim_vector& dv) 
     : MArray<FloatComplex> (dv.as_column ()) { }
 
   FloatComplexColumnVector (octave_idx_type n, const FloatComplex& val)
-    : MArray<FloatComplex> (n, 1, val) { }
+    : MArray<FloatComplex> (dim_vector (n, 1), val) { }
+
+  FloatComplexColumnVector (const FloatComplexColumnVector& a)
+    : MArray<FloatComplex> (a) { }
 
-  FloatComplexColumnVector (const FloatComplexColumnVector& a) : MArray<FloatComplex> (a) { }
+  FloatComplexColumnVector (const MArray<FloatComplex>& a)
+    : MArray<FloatComplex> (a.as_column ()) { }
 
-  FloatComplexColumnVector (const MArray<FloatComplex>& a) : MArray<FloatComplex> (a.as_column ()) { }
-  FloatComplexColumnVector (const Array<FloatComplex>& a) : MArray<FloatComplex> (a.as_column ()) { }
+  FloatComplexColumnVector (const Array<FloatComplex>& a)
+    : MArray<FloatComplex> (a.as_column ()) { }
 
   explicit FloatComplexColumnVector (const FloatColumnVector& a);