Mercurial > hg > octave-lyh

diff liboctave/Array.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/Array.h
+++ b/liboctave/Array.h
@@ -174,19 +174,11 @@
       slice_data (rep->data), slice_len (rep->len)
     { }
 
-  // 2D uninitialized ctor.
-  explicit Array (octave_idx_type m, octave_idx_type n)
-    : dimensions (m, n),
-      rep (new typename Array<T>::ArrayRep (dimensions.safe_numel ())), 
+  // Obsolete initialized 1D ctor (there are no 1D arrays).
+  explicit Array (octave_idx_type n, const T& val) GCC_ATTR_DEPRECATED
+    : dimensions (n, 1), rep (new typename Array<T>::ArrayRep (n)),
       slice_data (rep->data), slice_len (rep->len)
-    { }
-
-  // 2D initialized ctor.
-  explicit Array (octave_idx_type m, octave_idx_type n, const T& val)
-    : dimensions (m, n),
-      rep (new typename Array<T>::ArrayRep (dimensions.safe_numel ())),
-      slice_data (rep->data), slice_len (rep->len)
-    { 
+    {
       fill (val);
     }
 
@@ -212,8 +204,6 @@
   // Reshape constructor.
   Array (const Array<T>& a, const dim_vector& dv);
 
-  Array (const Array<T>& a, octave_idx_type nr, octave_idx_type nc);
-
   // Type conversion case.
   template <class U>
   Array (const Array<U>& a)
@@ -417,7 +407,7 @@
   Array<T> linear_slice (octave_idx_type lo, octave_idx_type up) const;
 
   Array<T> reshape (octave_idx_type nr, octave_idx_type nc) const
-    { return Array<T> (*this, nr, nc); }
+    { return Array<T> (*this, dim_vector (nr, nc)); }
 
   Array<T> reshape (const dim_vector& new_dims) const
     { return Array<T> (*this, new_dims); }