diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-06-23 08:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 08:54:12 +0200 |
| commit | bab5fd87a34d92737e92d0850be05890a5ce8e24 (patch) | |
| tree | 6c83cf8a907dc04075b52f394e25a33985dc5b41 /src/server/game/Entities/Player | |
| parent | 01c8d03e2ec67d4d4660e7e229274e86ba41420e (diff) | |
Core/Misc: Replace Trinity::make_unique with std (#24869)
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/CollectionMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Player/CollectionMgr.cpp b/src/server/game/Entities/Player/CollectionMgr.cpp index a715ea37b6a..e1fc18eee9c 100644 --- a/src/server/game/Entities/Player/CollectionMgr.cpp +++ b/src/server/game/Entities/Player/CollectionMgr.cpp @@ -85,7 +85,7 @@ namespace } } -CollectionMgr::CollectionMgr(WorldSession* owner) : _owner(owner), _appearances(Trinity::make_unique<boost::dynamic_bitset<uint32>>()) +CollectionMgr::CollectionMgr(WorldSession* owner) : _owner(owner), _appearances(std::make_unique<boost::dynamic_bitset<uint32>>()) { } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 939d7e750d1..cbf315cf6a5 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -346,14 +346,14 @@ Player::Player(WorldSession* session) : Unit(true), m_sceneMgr(this) m_achievementMgr = new PlayerAchievementMgr(this); m_reputationMgr = new ReputationMgr(this); - m_questObjectiveCriteriaMgr = Trinity::make_unique<QuestObjectiveCriteriaMgr>(this); + m_questObjectiveCriteriaMgr = std::make_unique<QuestObjectiveCriteriaMgr>(this); for (uint8 i = 0; i < MAX_CUF_PROFILES; ++i) _CUFProfiles[i] = nullptr; _advancedCombatLoggingEnabled = false; - _restMgr = Trinity::make_unique<RestMgr>(this); + _restMgr = std::make_unique<RestMgr>(this); _usePvpItemLevels = false; } @@ -18645,7 +18645,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) _LoadCUFProfiles(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_CUF_PROFILES)); - std::unique_ptr<Garrison> garrison = Trinity::make_unique<Garrison>(this); + std::unique_ptr<Garrison> garrison = std::make_unique<Garrison>(this); if (garrison->LoadFromDB(holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GARRISON), holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GARRISON_BLUEPRINTS), holder->GetPreparedResult(PLAYER_LOGIN_QUERY_LOAD_GARRISON_BUILDINGS), @@ -18704,7 +18704,7 @@ void Player::_LoadCUFProfiles(PreparedQueryResult result) continue; } - _CUFProfiles[id] = Trinity::make_unique<CUFProfile>(name, frameHeight, frameWidth, sortBy, healthText, boolOptions, topPoint, bottomPoint, leftPoint, topOffset, bottomOffset, leftOffset); + _CUFProfiles[id] = std::make_unique<CUFProfile>(name, frameHeight, frameWidth, sortBy, healthText, boolOptions, topPoint, bottomPoint, leftPoint, topOffset, bottomOffset, leftOffset); } while (result->NextRow()); } |
