From bab5fd87a34d92737e92d0850be05890a5ce8e24 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Tue, 23 Jun 2020 08:54:12 +0200 Subject: Core/Misc: Replace Trinity::make_unique with std (#24869) --- src/server/shared/Realm/RealmList.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/server/shared/Realm') diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp index 3ce8c8f2f4e..ca591e423f5 100644 --- a/src/server/shared/Realm/RealmList.cpp +++ b/src/server/shared/Realm/RealmList.cpp @@ -35,7 +35,7 @@ RealmList::RealmList() : _updateInterval(0) { - _realmsMutex = Trinity::make_unique(); + _realmsMutex = std::make_unique(); } RealmList::~RealmList() @@ -52,8 +52,8 @@ RealmList* RealmList::Instance() void RealmList::Initialize(Trinity::Asio::IoContext& ioContext, uint32 updateInterval) { _updateInterval = updateInterval; - _updateTimer = Trinity::make_unique(ioContext); - _resolver = Trinity::make_unique(ioContext); + _updateTimer = std::make_unique(ioContext); + _resolver = std::make_unique(ioContext); LoadBuildInfo(); // Get the content of the realmlist table in the database @@ -112,11 +112,11 @@ void RealmList::UpdateRealm(Realm& realm, Battlenet::RealmHandle const& id, uint realm.AllowedSecurityLevel = allowedSecurityLevel; realm.PopulationLevel = population; if (!realm.ExternalAddress || *realm.ExternalAddress != address) - realm.ExternalAddress = Trinity::make_unique(std::move(address)); + realm.ExternalAddress = std::make_unique(std::move(address)); if (!realm.LocalAddress || *realm.LocalAddress != localAddr) - realm.LocalAddress = Trinity::make_unique(std::move(localAddr)); + realm.LocalAddress = std::make_unique(std::move(localAddr)); if (!realm.LocalSubnetMask || *realm.LocalSubnetMask != localSubmask) - realm.LocalSubnetMask = Trinity::make_unique(std::move(localSubmask)); + realm.LocalSubnetMask = std::make_unique(std::move(localSubmask)); realm.Port = port; } -- cgit v1.2.3