From 40f36857fe3640c0d8dd96b2e36527ffc7f7d954 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Wed, 28 Oct 2009 18:07:25 +0000 Subject: * plugin.h (Plugin::Plugin): Initialize cleanup_done_. (Plugin::cleanup_done_): New member. (Plugin_manager::Plugin_manager): Remove cleanup_done_. (Plugin_manager::cleanup_done_): Remove. (Plugin_manager::add_input_file): Edit error message. * plugin.cc (Plugin::cleanup): Test and set cleanup_done_. (Plugin_manager::cleanup): Remove use of cleanup_done_. --- gold/plugin.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gold/plugin.h') diff --git a/gold/plugin.h b/gold/plugin.h index 965b389..fa6e594 100644 --- a/gold/plugin.h +++ b/gold/plugin.h @@ -54,7 +54,8 @@ class Plugin args_(), claim_file_handler_(NULL), all_symbols_read_handler_(NULL), - cleanup_handler_(NULL) + cleanup_handler_(NULL), + cleanup_done_(false) { } ~Plugin() @@ -112,6 +113,8 @@ class Plugin ld_plugin_claim_file_handler claim_file_handler_; ld_plugin_all_symbols_read_handler all_symbols_read_handler_; ld_plugin_cleanup_handler cleanup_handler_; + // TRUE if the cleanup handlers have been called. + bool cleanup_done_; }; // A manager class for plugins. @@ -121,7 +124,7 @@ class Plugin_manager public: Plugin_manager(const General_options& options) : plugins_(), objects_(), deferred_layout_objects_(), input_file_(NULL), - plugin_input_file_(), in_replacement_phase_(false), cleanup_done_(false), + plugin_input_file_(), in_replacement_phase_(false), options_(options), workqueue_(NULL), task_(NULL), input_objects_(NULL), symtab_(NULL), layout_(NULL), dirpath_(NULL), mapfile_(NULL), this_blocker_(NULL) @@ -263,9 +266,6 @@ class Plugin_manager // placeholder symbols from the Pluginobj objects. bool in_replacement_phase_; - // TRUE if the cleanup handlers have been called. - bool cleanup_done_; - const General_options& options_; Workqueue* workqueue_; Task* task_; -- cgit v1.1