mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-11 17:51:04 +00:00
Use C++11 mutexes only (remove compat code) (#5922)
* Fix event LINT & remove default constructor/destructors * remove compat code & modernize autolock header
This commit is contained in:
parent
8bdde45895
commit
d4c0f91275
36 changed files with 59 additions and 363 deletions
|
@ -42,7 +42,7 @@ namespace con
|
|||
#undef DEBUG_CONNECTION_KBPS
|
||||
#else
|
||||
/* this mutex is used to achieve log message consistency */
|
||||
Mutex log_message_mutex;
|
||||
std::mutex log_message_mutex;
|
||||
#define LOG(a) \
|
||||
{ \
|
||||
MutexAutoLock loglock(log_message_mutex); \
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue