aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Loot
diff options
context:
space:
mode:
authorGiacomo Pozzoni <giacomopoz@gmail.com>2020-07-18 16:34:45 +0000
committerGitHub <noreply@github.com>2020-07-18 18:34:45 +0200
commit7032ee0bdb47c995dfd89bce3d5b6fad13ec6d73 (patch)
tree1fef6be72920c2c6e1979ef19dabfc59360bdd27 /src/server/game/Loot
parentc54dc3ef9273378c55e0c17acef18de731a7f8eb (diff)
Core/Misc: Replace boost::shared_mutex with std::shared_mutex (#24328)
* Core/Misc: Replace boost::shared_mutex with std::shared_mutex * Remove std forward declarations
Diffstat (limited to 'src/server/game/Loot')
-rw-r--r--src/server/game/Loot/LootItemStorage.cpp19
-rw-r--r--src/server/game/Loot/LootItemStorage.h8
2 files changed, 10 insertions, 17 deletions
diff --git a/src/server/game/Loot/LootItemStorage.cpp b/src/server/game/Loot/LootItemStorage.cpp
index 988dabe9356..199de1a581a 100644
--- a/src/server/game/Loot/LootItemStorage.cpp
+++ b/src/server/game/Loot/LootItemStorage.cpp
@@ -25,9 +25,6 @@
#include "ObjectMgr.h"
#include "Player.h"
-#include <boost/thread/shared_mutex.hpp>
-#include <boost/thread/locks.hpp>
-
#include <unordered_map>
namespace
@@ -47,9 +44,9 @@ LootItemStorage* LootItemStorage::instance()
return &instance;
}
-boost::shared_mutex* LootItemStorage::GetLock()
+std::shared_mutex* LootItemStorage::GetLock()
{
- static boost::shared_mutex _lock;
+ static std::shared_mutex _lock;
return &_lock;
}
@@ -140,7 +137,7 @@ bool LootItemStorage::LoadStoredLoot(Item* item, Player* player)
// read
{
- boost::shared_lock<boost::shared_mutex> lock(*GetLock());
+ std::shared_lock<std::shared_mutex> lock(*GetLock());
auto itr = _lootItemStore.find(loot->containerID);
if (itr == _lootItemStore.end())
@@ -191,7 +188,7 @@ bool LootItemStorage::LoadStoredLoot(Item* item, Player* player)
void LootItemStorage::RemoveStoredMoneyForContainer(uint32 containerId)
{
// write
- boost::unique_lock<boost::shared_mutex> lock(*GetLock());
+ std::unique_lock<std::shared_mutex> lock(*GetLock());
auto itr = _lootItemStore.find(containerId);
if (itr == _lootItemStore.end())
@@ -204,7 +201,7 @@ void LootItemStorage::RemoveStoredLootForContainer(uint32 containerId)
{
// write
{
- boost::unique_lock<boost::shared_mutex> lock(*GetLock());
+ std::unique_lock<std::shared_mutex> lock(*GetLock());
_lootItemStore.erase(containerId);
}
@@ -223,7 +220,7 @@ void LootItemStorage::RemoveStoredLootForContainer(uint32 containerId)
void LootItemStorage::RemoveStoredLootItemForContainer(uint32 containerId, uint32 itemId, uint32 count)
{
// write
- boost::unique_lock<boost::shared_mutex> lock(*GetLock());
+ std::unique_lock<std::shared_mutex> lock(*GetLock());
auto itr = _lootItemStore.find(containerId);
if (itr == _lootItemStore.end())
@@ -240,7 +237,7 @@ void LootItemStorage::AddNewStoredLoot(Loot* loot, Player* player)
// read
{
- boost::shared_lock<boost::shared_mutex> lock(*GetLock());
+ std::shared_lock<std::shared_mutex> lock(*GetLock());
auto itr = _lootItemStore.find(loot->containerID);
if (itr != _lootItemStore.end())
@@ -282,7 +279,7 @@ void LootItemStorage::AddNewStoredLoot(Loot* loot, Player* player)
// write
{
- boost::unique_lock<boost::shared_mutex> lock(*GetLock());
+ std::unique_lock<std::shared_mutex> lock(*GetLock());
_lootItemStore.emplace(loot->containerID, std::move(container));
}
}
diff --git a/src/server/game/Loot/LootItemStorage.h b/src/server/game/Loot/LootItemStorage.h
index e1c32b5aeb8..3461342d1c0 100644
--- a/src/server/game/Loot/LootItemStorage.h
+++ b/src/server/game/Loot/LootItemStorage.h
@@ -21,6 +21,7 @@
#include "Define.h"
#include "DatabaseEnvFwd.h"
+#include <shared_mutex>
#include <unordered_map>
class Item;
@@ -28,11 +29,6 @@ class Player;
struct Loot;
struct LootItem;
-namespace boost
-{
- class shared_mutex;
-}
-
struct StoredLootItem
{
explicit StoredLootItem(LootItem const& lootItem);
@@ -76,7 +72,7 @@ class LootItemStorage
{
public:
static LootItemStorage* instance();
- static boost::shared_mutex* GetLock();
+ static std::shared_mutex* GetLock();
void LoadStorageFromDB();
bool LoadStoredLoot(Item* item, Player* player);