aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared
diff options
context:
space:
mode:
authorPeter Keresztes Schmidt <carbenium@outlook.com>2020-06-23 08:54:12 +0200
committerPeter Keresztes Schmidt <carbenium@outlook.com>2020-06-23 18:03:16 +0200
commitb210bb37130087d9a25a61dfb1b8baa60540c12c (patch)
tree2bd93f0a254f0d16a78c497817c9badb5d4b36b0 /src/server/shared
parentdc41aae0427faecef57b831f3a2ed735a9369dd7 (diff)
Core/Misc: Replace Trinity::make_unique with std (#24869)
(cherry picked from commit bab5fd87a34d92737e92d0850be05890a5ce8e24)
Diffstat (limited to 'src/server/shared')
-rw-r--r--src/server/shared/DataStores/DBCDatabaseLoader.cpp4
-rw-r--r--src/server/shared/Realm/RealmList.cpp10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.cpp b/src/server/shared/DataStores/DBCDatabaseLoader.cpp
index 0a721adf411..be57d76dc59 100644
--- a/src/server/shared/DataStores/DBCDatabaseLoader.cpp
+++ b/src/server/shared/DataStores/DBCDatabaseLoader.cpp
@@ -82,8 +82,8 @@ char* DBCDatabaseLoader::Load(uint32& records, char**& indexTable)
indexTable = tmpIdxTable;
}
- std::unique_ptr<char[]> dataTable = Trinity::make_unique<char[]>(result->GetRowCount() * _recordSize);
- std::unique_ptr<uint32[]> newIndexes = Trinity::make_unique<uint32[]>(result->GetRowCount());
+ std::unique_ptr<char[]> dataTable = std::make_unique<char[]>(result->GetRowCount() * _recordSize);
+ std::unique_ptr<uint32[]> newIndexes = std::make_unique<uint32[]>(result->GetRowCount());
uint32 newRecords = 0;
// Insert sql data into the data array
diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp
index fc76710c35f..522c0faeebb 100644
--- a/src/server/shared/Realm/RealmList.cpp
+++ b/src/server/shared/Realm/RealmList.cpp
@@ -42,8 +42,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
@@ -103,11 +103,11 @@ void RealmList::UpdateRealm(RealmHandle const& id, uint32 build, std::string con
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;
}