From 5fa199c6520b21a869486618a87a370b54bcc894 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 19 Sep 2017 15:58:19 +0100 Subject: [PATCH 1/2] copyable_atomic: add a ctor with initial value --- contrib/epee/include/copyable_atomic.h | 2 ++ 1 file changed, 2 insertions(+) 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(a.load()) {} copyable_atomic& operator= (const copyable_atomic& a) From 15e62581366af2bd3656654038896d6bbb94d450 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 19 Sep 2017 15:58:37 +0100 Subject: [PATCH 2/2] connection_context: initialize m_callback_request_count to 0 --- src/cryptonote_basic/connection_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 {