boost1.71-03-f4e5cc69aaa09f26f3dcd19f0e9db85b525b4b70

patch defuzzed by Peter Michael Green for Raspbian/Debian packaging.

commit f4e5cc69aaa09f26f3dcd19f0e9db85b525b4b70
Author: Brian Heim <brianlheim@gmail.com>
Date:   Sun Oct 6 18:39:38 2019 -0500

    supernova: fix compile errors with boost 1.71

    class hierarchy changed. this change is at least backward compatible with 1.70

    tested with boost 1.66, 1.71

Gbp-Pq: Name boost1.71-03-f4e5cc69aaa09f26f3dcd19f0e9db85b525b4b70

diff --git a/server/supernova/sc/sc_osc_handler.cpp b/server/supernova/sc/sc_osc_handler.cpp
index 681b5943d4244c892ba78c4a8c3e7ee8c5a1057f..ae7fd40034b8661ddaa94606950a5b5188e56f80 100644 (file)
--- a/server/supernova/sc/sc_osc_handler.cpp
+++ b/server/supernova/sc/sc_osc_handler.cpp
@@ -933,7 +933,7 @@ 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_executor().context());
+    tcp_connection::pointer new_connection = tcp_connection::create(tcp_acceptor_.get_executor());
 
     tcp_acceptor_.async_accept(new_connection->socket(),
                                boost::bind(&sc_osc_handler::handle_tcp_accept, this, new_connection,

diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp
index 3f488be9fa1b6823c12f6da18dbe419e1fb2c445..8008b9789c2e1a4dac8d21bd070087831985f129 100644 (file)
--- a/server/supernova/sc/sc_osc_handler.hpp
+++ b/server/supernova/sc/sc_osc_handler.hpp
@@ -276,9 +276,14 @@ public:
         public nova_endpoint
     {
     public:
-        typedef std::shared_ptr<tcp_connection> pointer;
+        using pointer = std::shared_ptr<tcp_connection>;
+#if BOOST_VERSION >= 107000
+        using executor = boost::asio::executor;
+#else
+        using executor = boost::asio::io_context::executor_type;
+#endif
 
-        static pointer create(boost::asio::io_service& io_service) { return pointer(new tcp_connection(io_service)); }
+        static pointer create(const executor& executor) { return pointer(new tcp_connection(executor)); }
 
         tcp::socket& socket()
         {
@@ -293,7 +298,11 @@ public:
         }
 
     private:
-        tcp_connection(boost::asio::io_service& io_service): socket_(io_service) {}
+#if BOOST_VERSION >= 107000
+        tcp_connection(const executor& executor): socket_(executor) {}
+#else
+        tcp_connection(const executor& executor): socket_(executor.context()) {}
+#endif
 
         void send(const char *data, size_t length) override final;