From 07989d6cf4dffc9b5a51f0a4bdb3ac36474a0cce Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 16 Jul 2019 17:30:38 +0200 Subject: [PATCH 1/2] Fix build with boost-1.70 (get_io_service() removed) Fixes https://github.com/supercollider/supercollider/issues/4490 --- server/supernova/sc/sc_osc_handler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp index 5116a1be87e..96e937ec256 100644 --- a/server/supernova/sc/sc_osc_handler.cpp +++ b/server/supernova/sc/sc_osc_handler.cpp @@ -728,7 +728,8 @@ void sc_osc_handler::tcp_connection::handle_message() { void sc_osc_handler::start_tcp_accept(void) { - tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_io_service()); + tcp_connection::pointer new_connection = + tcp_connection::create((boost::asio::io_context&)tcp_acceptor_.get_executor().context()); tcp_acceptor_.async_accept( new_connection->socket(), From 0e0f12219e5c6d9f0f34af78e3e5093d4ac2e44d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 16 Jul 2019 17:47:44 +0200 Subject: [PATCH 2/2] Fix build with boost-1.70 (missing checked_delete.hpp include) See also: https://www.boost.org/doc/libs/1_70_0/libs/core/doc/html/core/checked_delete.html --- server/supernova/utilities/utils.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/server/supernova/utilities/utils.hpp b/server/supernova/utilities/utils.hpp index 35b8ab5ada3..a7c191f2db1 100644 --- a/server/supernova/utilities/utils.hpp +++ b/server/supernova/utilities/utils.hpp @@ -23,6 +23,7 @@ #include +#include #include #include #include