oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Use C++11 mutexes only (remove compat code) (#5922)

Browse source 
* Fix event LINT & remove default constructor/destructors
* remove compat code & modernize autolock header
This commit is contained in:
Loïc Blot 2017-06-06 16:29:28 +02:00 • committed by GitHub
parent 8bdde45895
commit d4c0f91275
36 changed files with 59 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/network/connection.h
View file

@ -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;