Mercurial > hg > octave-nkf
diff src/load-path.h @ 9581:3d0d2bda3a0f
fix previous change, avoid duplicate loads of methods in descendant classes
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Thu, 27 Aug 2009 16:08:23 +0200 |
| parents | 0c7d84a65386 |
| children | d6b2b708b6b0 |
line wrap: on
line diff
--- a/src/load-path.h +++ b/src/load-path.h @@ -38,7 +38,7 @@ protected: load_path (void) - : dir_info_list (), fcn_map (), method_map (), parent_map () { } + : dir_info_list (), fcn_map (), method_map () { } public: @@ -236,13 +236,6 @@ return instance_ok () ? instance->do_system_path () : std::string (); } - static void add_to_parent_map (const std::string& classname, - const std::list<std::string>& parent_list) - { - if (instance_ok ()) - instance->do_add_to_parent_map (classname, parent_list); - } - private: static const int M_FILE = 1; @@ -402,12 +395,6 @@ typedef method_map_type::const_iterator const_method_map_iterator; typedef method_map_type::iterator method_map_iterator; - // <CLASS_NAME, PARENT_LIST>> - typedef std::map<std::string, std::list<std::string> > parent_map_type; - - typedef parent_map_type::const_iterator const_parent_map_iterator; - typedef parent_map_type::iterator parent_map_iterator; - mutable dir_info_list_type dir_info_list; mutable fcn_map_type fcn_map; @@ -416,8 +403,6 @@ mutable method_map_type method_map; - mutable parent_map_type parent_map; - static load_path *instance; static hook_fcn_ptr add_hook; @@ -518,9 +503,6 @@ std::string do_get_command_line_path (void) const { return command_line_path; } - void do_add_to_parent_map (const std::string& classname, - const std::list<std::string>& parent_list) const; - void add_to_fcn_map (const dir_info& di, bool at_end) const; void add_to_private_fcn_map (const dir_info& di) const;