Mercurial > hg > octave-jordi

changeset 5925:fe5cedbf3806

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-08-14 19:08:36 by jwe]
author jwe
date Mon, 14 Aug 2006 19:08:37 +0000
parents 87fcda0eda04
children ddfe04062467
files src/ChangeLog src/oct-map.h
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2006-08-14  John W. Eaton  <jwe@octave.org>
 
+	* oct-map.h (Octave_map::clear): Also clear key_list.
+
 	* load-path.cc (load_path::find_dir_info, load_path::do_add,
 	load_path::do_remove): Perform tilde expansion on directory here.
 
--- a/src/oct-map.h
+++ b/src/oct-map.h
@@ -135,7 +135,11 @@
   bool contains (const std::string& k) const
     { return (seek (k) != map.end ()); }
 
-  void clear (void) { map.clear (); }
+  void clear (void)
+    {
+      map.clear ();
+      key_list.clear ();
+    }
 
   string_vector keys (void) const;
 
@@ -183,10 +187,10 @@
   mutable dim_vector dimensions;
 
   void maybe_add_to_key_list (const std::string& k)
-  {
-    if (! contains (k))
-      key_list.push_back (k);
-  }
+    {
+      if (! contains (k))
+	key_list.push_back (k);
+    }
 };
 
 #endif