Mercurial > octave-nkf

changeset 2714:9f7598c8de22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-02-22 00:06:20 by jwe]
author jwe
date Sat, 22 Feb 1997 00:06:20 +0000
parents eb99ed3112d9
children df8c732b4fb2
files liboctave/Array2-idx.h liboctave/ChangeLog liboctave/idx-vector.cc
diffstat 3 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array2-idx.h	Fri Feb 21 22:34:50 1997 +0000
+++ b/liboctave/Array2-idx.h	Sat Feb 22 00:06:20 1997 +0000
@@ -279,9 +279,9 @@
 	    }
 	}
     }
-  else if (idx_j.is_colon_equiv (nr, 1))
+  else if (idx_j.is_colon_equiv (nc, 1))
     {
-      if (idx_i.is_colon_equiv (nc, 1))
+      if (idx_i.is_colon_equiv (nr, 1))
 	resize (0, 0);
       else
 	{
--- a/liboctave/ChangeLog	Fri Feb 21 22:34:50 1997 +0000
+++ b/liboctave/ChangeLog	Sat Feb 22 00:06:20 1997 +0000
@@ -1,5 +1,10 @@
 Fri Feb 21 16:07:56 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Array2-idx.h (Array2<T>::maybe_delete_elements): Use correct
+	dimension in check for colon equivalent index.
+	* idx-vector.cc (IDX_VEC_REP::is_colon_equiv): A single-element
+	index whose value is 0 is also colon eqivalent for n == 1.
+
 	* lo-ieee.cc (octave_ieee_init): Reorder #ifdef stuff to put
 	system-specific tests first.
 
--- a/liboctave/idx-vector.cc	Fri Feb 21 22:34:50 1997 +0000
+++ b/liboctave/idx-vector.cc	Sat Feb 22 00:06:20 1997 +0000
@@ -470,7 +470,7 @@
 	  delete [] tmp_data;
 	}
       else
-	colon_equiv = 0;
+	colon_equiv = (len == 1 && n == 1 && data[0] == 0);
 
       colon_equiv_checked = 1;
     }