diff options
| author | leak <leak@bitmx.net> | 2014-06-08 15:30:57 +0200 |
|---|---|---|
| committer | leak <leak@bitmx.net> | 2014-06-08 15:30:57 +0200 |
| commit | ee4a3b9d59867a2440f8eb35f96405e5c4f6fe28 (patch) | |
| tree | e6b3bb0b141565d8c0593e053466b8ccc629e93c /src/server/game/Server | |
| parent | 0fa3a4923efb492a71f888e256348148fdd73d80 (diff) | |
Replaced mutex related code in Common.h
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/WorldSocketMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 7880552ffa1..3c1db3551d0 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -29,13 +29,13 @@ #include <ace/Reactor_Impl.h> #include <ace/TP_Reactor.h> #include <ace/Dev_Poll_Reactor.h> -#include <ace/Guard_T.h> #include <ace/Atomic_Op.h> #include <ace/os_include/arpa/os_inet.h> #include <ace/os_include/netinet/os_tcp.h> #include <ace/os_include/sys/os_types.h> #include <ace/os_include/sys/os_socket.h> +#include <mutex> #include <set> #include "Log.h" @@ -109,7 +109,7 @@ class ReactorRunnable : protected ACE_Task_Base int AddSocket (WorldSocket* sock) { - TRINITY_GUARD(ACE_Thread_Mutex, m_NewSockets_Lock); + std::lock_guard<std::mutex> lock(newSocketsLock); ++m_Connections; sock->AddReference(); @@ -130,7 +130,7 @@ class ReactorRunnable : protected ACE_Task_Base void AddNewSockets() { - TRINITY_GUARD(ACE_Thread_Mutex, m_NewSockets_Lock); + std::lock_guard<std::mutex> lock(newSocketsLock); if (m_NewSockets.empty()) return; @@ -208,7 +208,7 @@ class ReactorRunnable : protected ACE_Task_Base SocketSet m_Sockets; SocketSet m_NewSockets; - ACE_Thread_Mutex m_NewSockets_Lock; + std::mutex newSocketsLock; }; WorldSocketMgr::WorldSocketMgr() : |