aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Realm
diff options
context:
space:
mode:
authorPeter Keresztes Schmidt <carbenium@outlook.com>2020-06-23 08:54:12 +0200
committerGitHub <noreply@github.com>2020-06-23 08:54:12 +0200
commitbab5fd87a34d92737e92d0850be05890a5ce8e24 (patch)
tree6c83cf8a907dc04075b52f394e25a33985dc5b41 /src/server/shared/Realm
parent01c8d03e2ec67d4d4660e7e229274e86ba41420e (diff)
Core/Misc: Replace Trinity::make_unique with std (#24869)
Diffstat (limited to 'src/server/shared/Realm')
-rw-r--r--src/server/shared/Realm/RealmList.cpp12
1 files changed, 6 insertions, 6 deletions
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<boost::shared_mutex>();
+ _realmsMutex = std::make_unique<boost::shared_mutex>();
}
RealmList::~RealmList()
@@ -52,8 +52,8 @@ RealmList* RealmList::Instance()
void RealmList::Initialize(Trinity::Asio::IoContext& ioContext, uint32 updateInterval)
{
_updateInterval = updateInterval;
- _updateTimer = Trinity::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
- _resolver = Trinity::make_unique<boost::asio::ip::tcp::resolver>(ioContext);
+ _updateTimer = std::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
+ _resolver = std::make_unique<boost::asio::ip::tcp::resolver>(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<boost::asio::ip::address>(std::move(address));
+ realm.ExternalAddress = std::make_unique<boost::asio::ip::address>(std::move(address));
if (!realm.LocalAddress || *realm.LocalAddress != localAddr)
- realm.LocalAddress = Trinity::make_unique<boost::asio::ip::address>(std::move(localAddr));
+ realm.LocalAddress = std::make_unique<boost::asio::ip::address>(std::move(localAddr));
if (!realm.LocalSubnetMask || *realm.LocalSubnetMask != localSubmask)
- realm.LocalSubnetMask = Trinity::make_unique<boost::asio::ip::address>(std::move(localSubmask));
+ realm.LocalSubnetMask = std::make_unique<boost::asio::ip::address>(std::move(localSubmask));
realm.Port = port;
}