aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-05-13 11:20:58 +0200
committerRiccardo Spagni <ric@spagni.net>2015-05-13 11:21:00 +0200
commitec5eca699d742f1a1358950fb71399b489395f1c (patch)
treeda5ff990921157461bc7569c6501b687c244cb2f /src
parentMerge pull request #277 (diff)
parentMerge branch 'clang_fixes' into clang_fixes-master (diff)
downloadmonero-ec5eca699d742f1a1358950fb71399b489395f1c.tar.xz
Merge pull request #280
2ff0d75 Fix missing virtual destructor (Sergey Kazenyuk) eb565a1 Suppress 'register storage class is deprecated' warning in boost dependency library (Sergey Kazenyuk)
Diffstat (limited to 'src')
-rw-r--r--src/p2p/net_node.h13
-rw-r--r--src/p2p/net_node.inl7
2 files changed, 10 insertions, 10 deletions
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h
index f86a4f97b..df726703f 100644
--- a/src/p2p/net_node.h
+++ b/src/p2p/net_node.h
@@ -82,15 +82,16 @@ namespace nodetool
node_server(t_payload_net_handler& payload_handler)
:m_payload_handler(payload_handler),
+ m_current_number_of_out_peers(0),
m_allow_local_ip(false),
- m_no_igd(false),
m_hide_my_port(false),
+ m_no_igd(false),
+ m_save_graph(false),
+ is_closing(false),
m_net_server( epee::net_utils::e_connection_type_P2P ) // this is a P2P connection of the main p2p node server, because this is class node_server<>
- {
- m_current_number_of_out_peers = 0;
- m_save_graph = false;
- is_closing = false;
- }
+ {}
+ virtual ~node_server()
+ {}
static void init_options(boost::program_options::options_description& desc);
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 1fbab9b20..cede6d0a0 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -97,7 +97,6 @@ namespace nodetool
const command_line::arg_descriptor<bool> arg_save_graph = {"save-graph", "Save data for dr monero", false};
}
-
//-----------------------------------------------------------------------------------
template<class t_payload_net_handler>
void node_server<t_payload_net_handler>::init_options(boost::program_options::options_description& desc)
@@ -116,9 +115,9 @@ namespace nodetool
command_line::add_arg(desc, arg_out_peers);
command_line::add_arg(desc, arg_tos_flag);
command_line::add_arg(desc, arg_limit_rate_up);
- command_line::add_arg(desc, arg_limit_rate_down);
- command_line::add_arg(desc, arg_limit_rate);
- command_line::add_arg(desc, arg_save_graph);
+ command_line::add_arg(desc, arg_limit_rate_down);
+ command_line::add_arg(desc, arg_limit_rate);
+ command_line::add_arg(desc, arg_save_graph);
}
//-----------------------------------------------------------------------------------
template<class t_payload_net_handler>