Skip to content

Commit 7e9b16e

Browse files
committed
ci: further fixes for boost 1.87 support
1 parent 4923aad commit 7e9b16e

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

cmake/deps/boost.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(BOOST_MINOR_MINIMAL 86)
1+
set(BOOST_MINOR_MINIMAL 87)
22
set(BOOST_MINOR_LATEST 87)
33

44
find_package(Boost 1.${BOOST_MINOR_MINIMAL} EXACT QUIET GLOBAL)

src/ossia/network/oscquery/oscquery_mirror.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ using http_request = ossia::net::http_get_request<http_answer, http_error>;
4848
struct http_client_context
4949
{
5050
std::thread thread;
51-
boost::asio::io_service context;
52-
std::shared_ptr<boost::asio::io_service::work> worker;
51+
boost::asio::io_context context;
52+
std::shared_ptr<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>> worker;
5353
};
5454
/*
5555
auto wait_for(std::future<void>& fut, std::chrono::milliseconds dur)
@@ -635,7 +635,7 @@ void oscquery_mirror_protocol::init()
635635

636636
void oscquery_mirror_protocol::start_http()
637637
{
638-
m_http->worker = std::make_shared<boost::asio::io_service::work>(m_http->context);
638+
m_http->worker = std::make_shared<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>>(m_http->context.get_executor());
639639
m_http->thread = std::thread([this] {
640640
ossia::set_thread_name("ossia oscq http");
641641
m_http->context.run();

src/ossia/network/sockets/websocket.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct websocket_simple_client : websocket_client
5252
{
5353
if(connected())
5454
{
55-
m_client->get_io_service().post([this] { websocket_client::stop(); });
55+
boost::asio::post(m_client->get_io_service(), [this] { websocket_client::stop(); });
5656
}
5757
}
5858

@@ -95,7 +95,7 @@ struct websocket_simple_server : ossia::net::websocket_server
9595

9696
void close()
9797
{
98-
m_server->get_io_service().post([this] { stop(); });
98+
boost::asio::post(m_server->get_io_service(), [this] { stop(); });
9999
}
100100

101101
std::vector<std::shared_ptr<void>> m_listeners;

0 commit comments

Comments
 (0)