From ddd83399ece7a9bfae45992509ffe6e0007a805f Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Mon, 23 Dec 2013 21:22:53 +0100 Subject: [PATCH 1/3] remove unused private _eventloop variable --- xorp/cli/xrl_cli_node.hh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xorp/cli/xrl_cli_node.hh b/xorp/cli/xrl_cli_node.hh index e7cdd9885..6605efac0 100644 --- a/xorp/cli/xrl_cli_node.hh +++ b/xorp/cli/xrl_cli_node.hh @@ -36,8 +36,7 @@ class XrlCliNode : public XrlStdRouter, public XrlCliTargetBase { public: - XrlCliNode(EventLoop& eventloop, - const string& class_name, + XrlCliNode(const string& class_name, const string& finder_hostname, uint16_t finder_port, const string& finder_target, @@ -241,7 +240,6 @@ private: CliNode& cli_node() const { return (_cli_node); } - EventLoop& _eventloop; CliNode& _cli_node; XrlCliProcessorV0p1Client _xrl_cli_processor_client; From 67d81fe0fd966be0f55f81be96bf032ec90ee0c5 Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Mon, 23 Dec 2013 21:51:39 +0100 Subject: [PATCH 2/3] Revert parts of commit ddd83399ece7a9bfae45992509ffe6e0007a805f. remove only private field, keep argument event loop in constructor --- xorp/cli/xrl_cli_node.hh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xorp/cli/xrl_cli_node.hh b/xorp/cli/xrl_cli_node.hh index 6605efac0..e4058db60 100644 --- a/xorp/cli/xrl_cli_node.hh +++ b/xorp/cli/xrl_cli_node.hh @@ -36,7 +36,8 @@ class XrlCliNode : public XrlStdRouter, public XrlCliTargetBase { public: - XrlCliNode(const string& class_name, + XrlCliNode(EventLoop& eventloop, + const string& class_name, const string& finder_hostname, uint16_t finder_port, const string& finder_target, From f0839e7ae40400356dcd3b6ef697eac19e77d0ba Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Mon, 23 Dec 2013 21:58:16 +0100 Subject: [PATCH 3/3] do not set private variable, it was deleted (cherry picked from commit dbb45f0db12a37434749e276f6986e4726b40a6f) --- xorp/cli/xrl_cli_node.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/xorp/cli/xrl_cli_node.cc b/xorp/cli/xrl_cli_node.cc index a67d016a1..4dc8274ec 100644 --- a/xorp/cli/xrl_cli_node.cc +++ b/xorp/cli/xrl_cli_node.cc @@ -40,7 +40,6 @@ XrlCliNode::XrlCliNode(EventLoop& eventloop, : XrlStdRouter(eventloop, class_name.c_str(), finder_hostname.c_str(), finder_port), XrlCliTargetBase(&xrl_router()), - _eventloop(eventloop), _cli_node(cli_node), _xrl_cli_processor_client(&xrl_router()), _is_finder_alive(false)