diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-06 16:29:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-06 16:29:28 +0200 |
commit | d4c0f91275fe70fef73b316c36abfb989dfd55b1 (patch) | |
tree | 6bbd5ebbdbac352c2991854fd88d84abe3ac2224 /src/network/connection.h | |
parent | 8bdde45895658f16aa6b2546ccb59c5c4c9fc699 (diff) | |
download | minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.gz minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.tar.bz2 minetest-d4c0f91275fe70fef73b316c36abfb989dfd55b1.zip |
Use C++11 mutexes only (remove compat code) (#5922)
* Fix event LINT & remove default constructor/destructors
* remove compat code & modernize autolock header
Diffstat (limited to 'src/network/connection.h')
-rw-r--r-- | src/network/connection.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/connection.h b/src/network/connection.h index 8b7ed9773..51cf6aec6 100644 --- a/src/network/connection.h +++ b/src/network/connection.h @@ -349,7 +349,7 @@ private: u16 m_oldest_non_answered_ack; - Mutex m_list_mutex; + std::mutex m_list_mutex; }; /* @@ -372,7 +372,7 @@ private: // Key is seqnum std::map<u16, IncomingSplitPacket*> m_buf; - Mutex m_map_mutex; + std::mutex m_map_mutex; }; struct OutgoingPacket @@ -544,7 +544,7 @@ public: void setWindowSize(unsigned int size) { window_size = size; }; private: - Mutex m_internal_mutex; + std::mutex m_internal_mutex; int window_size; u16 next_incoming_seqnum; @@ -738,7 +738,7 @@ class Peer { bool IncUseCount(); void DecUseCount(); - Mutex m_exclusive_access_mutex; + std::mutex m_exclusive_access_mutex; bool m_pending_deletion; @@ -1064,12 +1064,12 @@ private: std::map<u16, Peer*> m_peers; std::list<u16> m_peer_ids; - Mutex m_peers_mutex; + std::mutex m_peers_mutex; ConnectionSendThread m_sendThread; ConnectionReceiveThread m_receiveThread; - Mutex m_info_mutex; + std::mutex m_info_mutex; // Backwards compatibility PeerHandler *m_bc_peerhandler; |