Mercurial > hg > octave-jordi

changeset 4738:c9e5b9fa7b17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-02-05 18:42:58 by jwe]
author jwe
date Thu, 05 Feb 2004 18:42:58 +0000
parents 108c9a93196d
children 7bd3748e2735
files liboctave/Array.cc liboctave/ChangeLog
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array.cc
+++ b/liboctave/Array.cc
@@ -2060,8 +2060,8 @@
 
 	      retval.resize (frozen_lengths);
 	    }
-	  else if (all_colon_equiv (ra_idx, dimensions) 
-		    && frozen_lengths.length () == n_dims)
+	  else if (frozen_lengths.length () == n_dims
+		   && all_colon_equiv (ra_idx, dimensions))
 	    {
 	      retval = *this;
 	    }
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-05  Petter Risholm  <risholm@stud.ntnu.no>
+
+	* Array.cc (Array<T>::index): Check for frozen_lengths.length ()
+	== n_dims before checking to see if all indices are colon_equiv.
+
 2004-02-05  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Array.cc (Array<T>::assignN): Require RHS == 0x0 matrix for