Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dep/Boost: Partial support for boost 1.74 - asio

Browse Source 
Ref #25470
This commit is contained in:
Shauren
2020-09-27 20:20:59 +02:00
parent 7de23e4619
commit 155e37831e
5 changed files with 43 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/worldserver/Main.cpp
View File

@@ -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());