changeset 9380:182b7088af1c

oct-map.cc: fix thinko in previous change
author John W. Eaton <jwe@octave.org>
date Tue, 23 Jun 2009 09:58:12 -0400
parents d77fa87c47d8
children f9ab19428cd8
files src/ChangeLog src/oct-map.cc
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Jun 23 09:55:53 2009 -0400
+++ b/src/ChangeLog	Tue Jun 23 09:58:12 2009 -0400
@@ -1,8 +1,8 @@
 2009-06-23  John W. Eaton  <jwe@octave.org>
 
 	* oct-map.cc (Octave_map::squeeze, Octave_map::permute,
-	Octave_map::transpose, Octave_map::reshape, Octave_map::resize,
-	Octave_map::concat): Preserve key order.
+	Octave_map::transpose, Octave_map::reshape, Octave_map::concat):
+	Preserve key order.
 
 2009-06-23  Jaroslav Hajek  <highegg@gmail.com>
 
--- a/src/oct-map.cc	Tue Jun 23 09:55:53 2009 -0400
+++ b/src/oct-map.cc	Tue Jun 23 09:58:12 2009 -0400
@@ -200,17 +200,14 @@
 	      Cell tmp = contents(p);
 
 	      if (fill)
-		tmp.resize(dv, Cell::resize_fill_value ());
+		tmp.resize (dv, Cell::resize_fill_value ());
 	      else
-		tmp.resize(dv);
+		tmp.resize (dv);
 
 	      dimensions = dv;
 
 	      assign (key(p), tmp);
 	    }
-
-	  // Preserve order of keys.
-	  retval.key_list = key_list;
 	}
     }
 }