Skip to content

Commit bfb669d

Browse files
committed
ci: further fixes for boost 1.87 support
1 parent 5d1a38d commit bfb669d

File tree

6 files changed

+35
-24
lines changed

6 files changed

+35
-24
lines changed

src/plugins/score-plugin-avnd/AvndProcesses/Teleplot.hpp

+13-4
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,21 @@ struct Teleplot : PatternObject
5656

5757
boost::asio::io_context io_service;
5858
boost::asio::ip::udp::resolver resolver(io_service);
59-
boost::asio::ip::udp::resolver::query query(m_queryHost, m_queryPort);
60-
boost::asio::ip::udp::resolver::iterator iter = resolver.resolve(query);
6159

62-
auto addr = iter->endpoint().address().to_string();
60+
auto results = resolver.resolve(
61+
boost::asio::ip::udp::v4(), m_queryHost, m_queryPort,
62+
boost::asio::ip::resolver_base::numeric_service);
6363

64-
return {addr, std::stoi(m_queryPort)};
64+
if(!results.empty())
65+
{
66+
auto addr = results.begin()->endpoint().address().to_string();
67+
68+
return {addr, std::stoi(m_queryPort)};
69+
}
70+
else
71+
{
72+
return {};
73+
}
6574
}
6675
catch(const std::exception& e)
6776
{

src/plugins/score-plugin-deviceexplorer/Explorer/Widgets/ZeroConf/ZeroconfBrowser.cpp

+10-5
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,18 @@ void ZeroconfBrowser::accept()
159159

160160
try
161161
{
162-
boost::asio::io_service io_service;
162+
boost::asio::io_context io_service;
163163
boost::asio::ip::tcp::resolver resolver(io_service);
164-
boost::asio::ip::tcp::resolver::query query(ip.toStdString(), std::to_string(port));
165-
boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(query);
166-
if(iter->endpoint().address().is_loopback())
164+
auto results = resolver.resolve(
165+
boost::asio::ip::tcp::v4(), ip.toStdString(), std::to_string(port),
166+
boost::asio::ip::resolver_base::numeric_service);
167+
for(auto& result : results)
167168
{
168-
ip = "localhost";
169+
if(result.endpoint().address().is_loopback())
170+
{
171+
ip = "localhost";
172+
break;
173+
}
169174
}
170175
}
171176
catch(...)

src/plugins/score-plugin-engine/LocalTree/Device/LocalDevice.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void LocalDevice::init()
122122
if(auto plug = m_ctx.findPlugin<Explorer::DeviceDocumentPlugin>())
123123
{
124124
QPointer<LocalDevice> self = this;
125-
plug->networkContext()->context.post(
125+
boost::asio::post(plug->networkContext()->context,
126126
[=, name = m_dev.get_name()] { exposeZeroconf(name, set, self); });
127127
}
128128
else

src/plugins/score-plugin-protocols/Protocols/DNSSDDeviceEnumerator.cpp

+6-8
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,23 @@ class DNSSDWorker
4949

5050
try
5151
{
52-
boost::asio::io_service io_service;
52+
boost::asio::io_context io_service;
5353

5454
boost::asio::ip::tcp::resolver resolver(io_service);
55-
boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(
55+
auto results = resolver.resolve(
5656
boost::asio::ip::tcp::v4(), ip, port,
5757
boost::asio::ip::resolver_base::numeric_service);
5858

59-
boost::asio::ip::tcp::resolver::iterator end;
60-
while(iter != end)
59+
for(auto& result :results)
6160
{
62-
if(iter->endpoint().address().is_loopback())
61+
if(result.endpoint().address().is_loopback())
6362
{
6463
ip = "localhost";
6564
break;
6665
}
67-
else
66+
else if(result.endpoint().address().is_v4())
6867
{
69-
ip = iter->endpoint().address().to_string();
70-
++iter;
68+
ip = result.endpoint().address().to_string();
7169
}
7270
}
7371
}

src/plugins/score-plugin-protocols/Protocols/OSCQuery/OSCQueryDevice.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,11 @@ static bool resolve_ip(const std::string& host)
5252
else if(boost::starts_with(queryHost, "ws://"))
5353
queryHost.erase(queryHost.begin(), queryHost.begin() + 5);
5454

55-
boost::asio::io_service io_service;
55+
boost::asio::io_context io_service;
5656
boost::asio::ip::tcp::resolver resolver(io_service);
57-
boost::asio::ip::tcp::resolver::query query(
58-
queryHost, queryPort, boost::asio::ip::resolver_base::numeric_service);
59-
boost::asio::ip::tcp::resolver::iterator iter = resolver.resolve(query);
60-
return true;
57+
auto res = resolver.resolve(
58+
boost::asio::ip::tcp::v4(), queryHost, queryPort, boost::asio::ip::resolver_base::numeric_service);
59+
return !res.empty();
6160
}
6261
catch(const std::exception& e)
6362
{

0 commit comments

Comments
 (0)