From 155e37831e9c581c6a8ebba34fe70d3459301d0a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 27 Sep 2020 20:20:59 +0200 Subject: Dep/Boost: Partial support for boost 1.74 - asio Ref #25470 --- src/server/worldserver/Main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/worldserver/Main.cpp') 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 externalAddress = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[2].GetString(), ""); + Optional 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(externalAddress->address()); - Optional localAddress = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[3].GetString(), ""); + Optional 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(localAddress->address()); - Optional localSubmask = Trinity::Net::Resolve(resolver, boost::asio::ip::tcp::v4(), fields[4].GetString(), ""); + Optional 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()); -- cgit v1.2.3