diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-03-05 10:10:57 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-03-05 10:10:57 +0200 |
commit | 5fb4a9719cb799ae59e04cda0a3d760be969d7e8 (patch) | |
tree | 8a7361e525f9e7e45bb04e4f252fd9a1c430d0a7 /src/p2p/net_node.h | |
parent | Merge pull request #5162 (diff) | |
parent | check load_t_from_json return values (diff) | |
download | monero-5fb4a9719cb799ae59e04cda0a3d760be969d7e8.tar.xz |
Merge pull request #5101
23abe607 check load_t_from_json return values (moneromooo-monero)
e396146a default initialize rpc structures (moneromooo-monero)
ef93b099 various: remove unused variables (moneromooo-monero)
Diffstat (limited to 'src/p2p/net_node.h')
-rw-r--r-- | src/p2p/net_node.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h index 58e3c8857..4c5f788c3 100644 --- a/src/p2p/net_node.h +++ b/src/p2p/net_node.h @@ -131,9 +131,9 @@ namespace nodetool struct network_zone; using connect_func = boost::optional<p2p_connection_context>(network_zone&, epee::net_utils::network_address const&, epee::net_utils::ssl_support_t); - struct config + struct config_t { - config() + config_t() : m_net_config(), m_peer_id(crypto::rand<uint64_t>()), m_support_flags(0) @@ -143,6 +143,7 @@ namespace nodetool uint64_t m_peer_id; uint32_t m_support_flags; }; + typedef epee::misc_utils::struct_init<config_t> config; struct network_zone { |