Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Riccardo Spagni 2017-10-06 22:58:54 +04:00
parent 2ff832c576 15e6258136
commit e8a7291d12
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/epee/include/copyable_atomic.h
View File

@ -35,6 +35,8 @@ namespace epee
public: public:
copyable_atomic() copyable_atomic()
{}; {};
copyable_atomic(uint32_t value)
{ store(value); }
copyable_atomic(const copyable_atomic& a):std::atomic<uint32_t>(a.load()) copyable_atomic(const copyable_atomic& a):std::atomic<uint32_t>(a.load())
{} {}
copyable_atomic& operator= (const copyable_atomic& a) copyable_atomic& operator= (const copyable_atomic& a)

2
src/cryptonote_basic/connection_context.h
View File

@ -40,7 +40,7 @@ namespace cryptonote
struct cryptonote_connection_context: public epee::net_utils::connection_context_base 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), 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 enum state
{ {