diff options
| author | Sergey Kazenyuk <sergey@kazenyuk.com> | 2015-05-06 19:10:51 +0300 |
|---|---|---|
| committer | Sergey Kazenyuk <sergey@kazenyuk.com> | 2015-05-06 19:10:51 +0300 |
| commit | 867e98d739ded6cb314665e537c23a780acd6a3e (patch) | |
| tree | dede3c026e7d27363db544af08854f202f057863 /src | |
| parent | Merge pull request #269 (diff) | |
| parent | Fix missing virtual destructor (diff) | |
| download | monero-867e98d739ded6cb314665e537c23a780acd6a3e.tar.xz | |
Merge branch 'clang_fixes' into clang_fixes-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/p2p/net_node.h | 13 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 7 |
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> |