diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-06 22:58:54 +0400 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-06 22:58:54 +0400 |
| commit | e8a7291d1283f26a33b0250cbd125b000e6e3b7f (patch) | |
| tree | 822f295132ffad2766de07a1a9ca52e3b4d5a31a | |
| parent | Merge pull request #2540 (diff) | |
| parent | connection_context: initialize m_callback_request_count to 0 (diff) | |
| download | monero-e8a7291d1283f26a33b0250cbd125b000e6e3b7f.tar.xz | |
Merge pull request #2541
15e62581 connection_context: initialize m_callback_request_count to 0 (moneromooo-monero)
5fa199c6 copyable_atomic: add a ctor with initial value (moneromooo-monero)
| -rw-r--r-- | contrib/epee/include/copyable_atomic.h | 2 | ||||
| -rw-r--r-- | src/cryptonote_basic/connection_context.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/epee/include/copyable_atomic.h b/contrib/epee/include/copyable_atomic.h index 410b4b4ff..00a5f484b 100644 --- a/contrib/epee/include/copyable_atomic.h +++ b/contrib/epee/include/copyable_atomic.h @@ -35,6 +35,8 @@ namespace epee public: copyable_atomic() {}; + copyable_atomic(uint32_t value) + { store(value); } copyable_atomic(const copyable_atomic& a):std::atomic<uint32_t>(a.load()) {} copyable_atomic& operator= (const copyable_atomic& a) diff --git a/src/cryptonote_basic/connection_context.h b/src/cryptonote_basic/connection_context.h index da4b6512e..e173348db 100644 --- a/src/cryptonote_basic/connection_context.h +++ b/src/cryptonote_basic/connection_context.h @@ -40,7 +40,7 @@ namespace cryptonote struct cryptonote_connection_context: public epee::net_utils::connection_context_base { cryptonote_connection_context(): m_state(state_before_handshake), m_remote_blockchain_height(0), m_last_response_height(0), - m_last_known_hash(crypto::null_hash) {} + m_callback_request_count(0), m_last_known_hash(crypto::null_hash) {} enum state { |