changeset 10907:6105ed2db9d7

load_path::dir_info::initialize: clear method_file_map before updating file list
author John W. Eaton <jwe@octave.org>
date Mon, 23 Aug 2010 15:57:37 -0400
parents e48a45b9a265
children c98a0d05b24a
files src/ChangeLog src/load-path.cc src/load-path.h
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-23  John W. Eaton  <jwe@octave.org>
+
+	* load-path.cc (load_path::dir_info::initialize): Clear
+	method_file_map before updating file list.
+	* load-path.cc (load_path::load_path): Explicitly initialize
+	private_fcn_map.
+
 2010-08-17  Rik <octave@nomad.inbox5.com>
 
 	* mappers.cc (gamma,lgamma): Add %!tests for negative integer
--- a/src/load-path.cc
+++ b/src/load-path.cc
@@ -117,6 +117,8 @@
 
   if (fs)
     {
+      method_file_map.clear ();
+
       dir_mtime = fs.mtime ();
       dir_time_last_checked = octave_time ();
 
--- a/src/load-path.h
+++ b/src/load-path.h
@@ -39,7 +39,7 @@
 protected:
 
   load_path (void)
-    : dir_info_list (), fcn_map (), method_map () { }
+    : dir_info_list (), fcn_map (), private_fcn_map (), method_map () { }
 
 public:
 
@@ -404,7 +404,7 @@
 
   typedef method_map_type::const_iterator const_method_map_iterator;
   typedef method_map_type::iterator method_map_iterator;
- 
+
   mutable dir_info_list_type dir_info_list;
 
   mutable fcn_map_type fcn_map;