Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Local-only mode fix (#23546)

Browse Source 
* Local-only mode fix

In response to issue #21309

* Full patch also for boost 1.66 and newer
This commit is contained in:
SolarisSDK authored and Ovahlord committed 2019-09-12 01:09:36 +02:00
1 parent 0b79415e59
commit a0e7958f85
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Asio/Resolver.h
+4 -2
View File
@@ -31,13 +31,15 @@ namespace Trinity
{
boost::system::error_code ec;
#if BOOST_VERSION >= 106600
boost::asio::ip::tcp::resolver::results_type results = resolver.resolve(protocol, host, service, ec);
boost::asio::ip::resolver_base::flags flagsResolver = boost::asio::ip::resolver_base::all_matching;
boost::asio::ip::tcp::resolver::results_type results = resolver.resolve(protocol, host, service, flagsResolver, ec);
if (results.begin() == results.end() || ec)
return {};
return results.begin()->endpoint();
#else
boost::asio::ip::tcp::resolver::query query(std::move(protocol), std::move(host), std::move(service));
boost::asio::ip::resolver_query_base::flags flagsQuery = boost::asio::ip::tcp::resolver::query::all_matching;
boost::asio::ip::tcp::resolver::query query(std::move(protocol), std::move(host), std::move(service), flagsQuery);
boost::asio::ip::tcp::resolver::iterator itr = resolver.resolve(query, ec);
boost::asio::ip::tcp::resolver::iterator end;
if (itr == end || ec)