diff options
Diffstat (limited to 'src/server/shared/Realm')
| -rw-r--r-- | src/server/shared/Realm/RealmList.cpp | 12 | ||||
| -rw-r--r-- | src/server/shared/Realm/RealmList.h | 11 |
2 files changed, 6 insertions, 17 deletions
diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp index 9baf4d35615..094982d001c 100644 --- a/src/server/shared/Realm/RealmList.cpp +++ b/src/server/shared/Realm/RealmList.cpp @@ -38,9 +38,7 @@ RealmList::RealmList() : _updateInterval(0) _realmsMutex = std::make_unique<boost::shared_mutex>(); } -RealmList::~RealmList() -{ -} +RealmList::~RealmList() = default; RealmList* RealmList::Instance() { @@ -53,7 +51,7 @@ void RealmList::Initialize(Trinity::Asio::IoContext& ioContext, uint32 updateInt { _updateInterval = updateInterval; _updateTimer = std::make_unique<Trinity::Asio::DeadlineTimer>(ioContext); - _resolver = std::make_unique<boost::asio::ip::tcp::resolver>(ioContext); + _resolver = std::make_unique<Trinity::Asio::Resolver>(ioContext); LoadBuildInfo(); // Get the content of the realmlist table in the database @@ -151,21 +149,21 @@ void RealmList::UpdateRealms(boost::system::error_code const& error) std::string localAddressString = fields[3].GetString(); std::string localSubmaskString = fields[4].GetString(); - Optional<boost::asio::ip::tcp::endpoint> externalAddress = Trinity::Net::Resolve(*_resolver, boost::asio::ip::tcp::v4(), externalAddressString, ""); + Optional<boost::asio::ip::tcp::endpoint> externalAddress = _resolver->Resolve(boost::asio::ip::tcp::v4(), externalAddressString, ""); if (!externalAddress) { TC_LOG_ERROR("realmlist", "Could not resolve address %s for realm \"%s\" id %u", externalAddressString.c_str(), name.c_str(), realmId); continue; } - Optional<boost::asio::ip::tcp::endpoint> localAddress = Trinity::Net::Resolve(*_resolver, boost::asio::ip::tcp::v4(), localAddressString, ""); + Optional<boost::asio::ip::tcp::endpoint> localAddress = _resolver->Resolve(boost::asio::ip::tcp::v4(), localAddressString, ""); if (!localAddress) { TC_LOG_ERROR("realmlist", "Could not resolve localAddress %s for realm \"%s\" id %u", localAddressString.c_str(), name.c_str(), realmId); continue; } - Optional<boost::asio::ip::tcp::endpoint> localSubmask = Trinity::Net::Resolve(*_resolver, boost::asio::ip::tcp::v4(), localSubmaskString, ""); + Optional<boost::asio::ip::tcp::endpoint> localSubmask = _resolver->Resolve(boost::asio::ip::tcp::v4(), localSubmaskString, ""); if (!localSubmask) { TC_LOG_ERROR("realmlist", "Could not resolve localSubnetMask %s for realm \"%s\" id %u", localSubmaskString.c_str(), name.c_str(), realmId); diff --git a/src/server/shared/Realm/RealmList.h b/src/server/shared/Realm/RealmList.h index 7475a4b0dc7..bd7270e73a3 100644 --- a/src/server/shared/Realm/RealmList.h +++ b/src/server/shared/Realm/RealmList.h @@ -69,15 +69,6 @@ namespace JSON } } -namespace Trinity -{ - namespace Asio - { - class IoContext; - class DeadlineTimer; - } -} - /// Storage object for the list of realms on the server class TC_SHARED_API RealmList { @@ -116,7 +107,7 @@ private: std::unordered_set<std::string> _subRegions; uint32 _updateInterval; std::unique_ptr<Trinity::Asio::DeadlineTimer> _updateTimer; - std::unique_ptr<boost::asio::ip::tcp_resolver> _resolver; + std::unique_ptr<Trinity::Asio::Resolver> _resolver; }; #define sRealmList RealmList::Instance() |