diff options
| author | leak <leak@bitmx.net> | 2014-07-02 02:20:53 +0200 |
|---|---|---|
| committer | leak <leak@bitmx.net> | 2014-07-02 02:20:53 +0200 |
| commit | e0aed65c8ce46053b078bce0ea237db249e5b1dc (patch) | |
| tree | c79299308fa8eed9e9b35efe01ce5023cb2da928 /src/server/game/Warden | |
| parent | 66c94ce965b763a3c144c0e542e7329a24a3a2e3 (diff) | |
ACE cleanup on game, now the major issue remains WorldSocket
Diffstat (limited to 'src/server/game/Warden')
| -rw-r--r-- | src/server/game/Warden/WardenCheckMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Warden/WardenCheckMgr.h | 4 | ||||
| -rw-r--r-- | src/server/game/Warden/WardenWin.cpp | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp index 44bab1d31b3..98ed381a2b1 100644 --- a/src/server/game/Warden/WardenCheckMgr.cpp +++ b/src/server/game/Warden/WardenCheckMgr.cpp @@ -164,7 +164,7 @@ void WardenCheckMgr::LoadWardenOverrides() uint32 count = 0; - ACE_WRITE_GUARD(ACE_RW_Mutex, g, _checkStoreLock); + boost::unique_lock<boost::shared_mutex> lock(sWardenCheckMgr->_checkStoreLock); do { diff --git a/src/server/game/Warden/WardenCheckMgr.h b/src/server/game/Warden/WardenCheckMgr.h index 1108c9a6521..c9e26283060 100644 --- a/src/server/game/Warden/WardenCheckMgr.h +++ b/src/server/game/Warden/WardenCheckMgr.h @@ -20,6 +20,8 @@ #define _WARDENCHECKMGR_H #include <map> +#include <boost/thread/locks.hpp> +#include <boost/thread/shared_mutex.hpp> #include "Cryptography/BigNumber.h" enum WardenActions @@ -72,7 +74,7 @@ class WardenCheckMgr void LoadWardenChecks(); void LoadWardenOverrides(); - ACE_RW_Mutex _checkStoreLock; + boost::shared_mutex _checkStoreLock; private: CheckContainer CheckStore; diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp index 18bf2897358..5c3a86988db 100644 --- a/src/server/game/Warden/WardenWin.cpp +++ b/src/server/game/Warden/WardenWin.cpp @@ -206,7 +206,7 @@ void WardenWin::RequestData() ByteBuffer buff; buff << uint8(WARDEN_SMSG_CHEAT_CHECKS_REQUEST); - ACE_READ_GUARD(ACE_RW_Mutex, g, sWardenCheckMgr->_checkStoreLock); + boost::shared_lock<boost::shared_mutex> lock(sWardenCheckMgr->_checkStoreLock); for (uint32 i = 0; i < sWorld->getIntConfig(CONFIG_WARDEN_NUM_OTHER_CHECKS); ++i) { @@ -369,7 +369,7 @@ void WardenWin::HandleData(ByteBuffer &buff) uint8 type; uint16 checkFailed = 0; - ACE_READ_GUARD(ACE_RW_Mutex, g, sWardenCheckMgr->_checkStoreLock); + boost::shared_lock<boost::shared_mutex> lock(sWardenCheckMgr->_checkStoreLock); for (std::list<uint16>::iterator itr = _currentChecks.begin(); itr != _currentChecks.end(); ++itr) { |