changeset 12010:00b55509f5b5 release-3-2-x

oct-map.cc: fix thinko in previous change
author John W. Eaton <jwe@octave.org>
date Wed, 24 Jun 2009 07:30:49 +0200
parents 4e2138bc1152
children 67ad3b58b99a
files src/ChangeLog src/oct-map.cc
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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-22  Jaroslav Hajek  <highegg@gmail.com>
 
--- a/src/oct-map.cc
+++ b/src/oct-map.cc
@@ -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;
 	}
     }
 }