diff options
author | Shauren <shauren.trinity@gmail.com> | 2020-09-27 20:20:59 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2020-09-27 20:20:59 +0200 |
commit | 155e37831e9c581c6a8ebba34fe70d3459301d0a (patch) | |
tree | 9fe0dc5484d421cfbd5b73c05b11449c24924af0 /src/server/worldserver/Main.cpp | |
parent | 7de23e4619774de849e1f848402285a0f8250948 (diff) |
Dep/Boost: Partial support for boost 1.74 - asio
Ref #25470
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r-- | src/server/worldserver/Main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 98dc8913c45..241c9ee462b 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -517,11 +517,11 @@ bool LoadRealmInfo(Trinity::Asio::IoContext& ioContext) if (!result) return false; - boost::asio::ip::tcp::resolver resolver(ioContext); + Trinity::Asio::Resolver resolver(ioContext); Field* fields = result->Fetch(); realm.Name = fields[1].GetString(); - Optional<boost::asio::ip::tcp::endpoint> externalAddress = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[2].GetString(), ""); + Optional<boost::asio::ip::tcp::endpoint> externalAddress = resolver.Resolve(boost::asio::ip::tcp::v4(), fields[2].GetString(), ""); if (!externalAddress) { TC_LOG_ERROR("server.worldserver", "Could not resolve address %s", fields[2].GetString().c_str()); @@ -530,7 +530,7 @@ bool LoadRealmInfo(Trinity::Asio::IoContext& ioContext) realm.ExternalAddress = std::make_unique<boost::asio::ip::address>(externalAddress->address()); - Optional<boost::asio::ip::tcp::endpoint> localAddress = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[3].GetString(), ""); + Optional<boost::asio::ip::tcp::endpoint> localAddress = resolver.Resolve(boost::asio::ip::tcp::v4(), fields[3].GetString(), ""); if (!localAddress) { TC_LOG_ERROR("server.worldserver", "Could not resolve address %s", fields[3].GetString().c_str()); @@ -539,7 +539,7 @@ bool LoadRealmInfo(Trinity::Asio::IoContext& ioContext) realm.LocalAddress = std::make_unique<boost::asio::ip::address>(localAddress->address()); - Optional<boost::asio::ip::tcp::endpoint> localSubmask = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[4].GetString(), ""); + Optional<boost::asio::ip::tcp::endpoint> localSubmask = resolver.Resolve(boost::asio::ip::tcp::v4(), fields[4].GetString(), ""); if (!localSubmask) { TC_LOG_ERROR("server.worldserver", "Could not resolve address %s", fields[4].GetString().c_str()); |