# HG changeset patch # User jwe # Date 1155582517 0 # Node ID fe5cedbf3806208110365e7db4cf1845da6bfce4 # Parent 87fcda0eda046216dacb5fedf71e020fa05691f7 [project @ 2006-08-14 19:08:36 by jwe] diff -r 87fcda0eda04 -r fe5cedbf3806 src/ChangeLog --- a/src/ChangeLog Mon Aug 14 18:41:15 2006 +0000 +++ b/src/ChangeLog Mon Aug 14 19:08:37 2006 +0000 @@ -1,5 +1,7 @@ 2006-08-14 John W. Eaton + * 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. diff -r 87fcda0eda04 -r fe5cedbf3806 src/oct-map.h --- a/src/oct-map.h Mon Aug 14 18:41:15 2006 +0000 +++ b/src/oct-map.h Mon Aug 14 19:08:37 2006 +0000 @@ -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