diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-03-25 05:56:36 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-03-25 05:56:36 -0400 |
| commit | 5c0bc0050ccfd579ed75be384e928e0165d6b2ce (patch) | |
| tree | 7bce2200f19b05448cb719b54037a7c2c82d6bab /src/p2p/net_node.h | |
| parent | Merges #36 (diff) | |
| parent | Merge pull request #243 (diff) | |
| download | monero-5c0bc0050ccfd579ed75be384e928e0165d6b2ce.tar.xz | |
Merge upstream updates into blockchain branch
Diffstat (limited to 'src/p2p/net_node.h')
| -rw-r--r-- | src/p2p/net_node.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h index 97fcd56c8..a778cd9e8 100644 --- a/src/p2p/net_node.h +++ b/src/p2p/net_node.h @@ -82,18 +82,16 @@ namespace nodetool node_server( t_payload_net_handler& payload_handler - , boost::uuids::uuid network_id ) : m_payload_handler(payload_handler) , m_allow_local_ip(false) , m_hide_my_port(false) - , m_network_id(std::move(network_id)) {} static void init_options(boost::program_options::options_description& desc); bool run(); - bool init(const boost::program_options::variables_map& vm, bool testnet); + bool init(const boost::program_options::variables_map& vm); bool deinit(); bool send_stop_signal(); uint32_t get_this_peer_port(){return m_listenning_port;} |