Mercurial > hg > octave-nkf

diff liboctave/Array.h @ 10095:eb8ac0eed9f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
always chop dimension vector when constructing Arrays
author Jaroslav Hajek <highegg@gmail.com>
date Wed, 13 Jan 2010 18:19:37 +0100
parents 84b0725f4b09
children ed49cef7e005
line wrap: on
line diff
--- a/liboctave/Array.h
+++ b/liboctave/Array.h
@@ -145,6 +145,7 @@
     { 
       slice_data = rep->data;
       slice_len = rep->len;
+      dimensions.chop_trailing_singletons ();
     }
 
   // slice constructor
@@ -155,6 +156,7 @@
       rep->count++;
       slice_data = a.slice_data + l;
       slice_len = u - l;
+      dimensions.chop_trailing_singletons ();
     }
 
 private:
@@ -231,6 +233,7 @@
     { 
       slice_data = rep->data;
       slice_len = rep->len;
+      dimensions.chop_trailing_singletons ();
     }
 
   Array (const dim_vector& dv, const T& val)
@@ -240,6 +243,7 @@
       slice_data = rep->data;
       slice_len = rep->len;
       fill (val);
+      dimensions.chop_trailing_singletons ();
     }
 
   // Reshape constructor.
@@ -300,7 +304,7 @@
 
   Array<T> squeeze (void) const;
   
-  void chop_trailing_singletons (void) 
+  void chop_trailing_singletons (void) GCC_ATTR_DEPRECATED
   { dimensions.chop_trailing_singletons (); }
   
   octave_idx_type compute_index (const Array<octave_idx_type>& ra_idx) const;