From 6b450f36c14dd16d476f10f3e4eb1c5c26a78daa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 18 Apr 2019 09:40:15 +0200 Subject: [PATCH] socket_pdu_impl.cc: fix build with boost 1.70.0 Fix #2446 Signed-off-by: Fabrice Fontaine [Upstream status: https://github.com/gnuradio/gnuradio/pull/2451] --- gr-blocks/lib/socket_pdu_impl.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc index e20f1478f..d9dd1edd6 100644 --- a/gr-blocks/lib/socket_pdu_impl.cc +++ b/gr-blocks/lib/socket_pdu_impl.cc @@ -29,6 +29,12 @@ #include #include +#if BOOST_VERSION >= 107000 +#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s)->get_executor().context()) +#else +#define GET_IO_SERVICE(s) ((s)->get_io_service()) +#endif + namespace gr { namespace blocks { @@ -165,7 +171,7 @@ namespace gr { void socket_pdu_impl::start_tcp_accept() { - tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay); + tcp_connection::sptr new_connection = tcp_connection::make(GET_IO_SERVICE(d_acceptor_tcp), d_rxbuf.size(), d_tcp_no_delay); d_acceptor_tcp->async_accept(new_connection->socket(), boost::bind(&socket_pdu_impl::handle_tcp_accept, this, -- 2.20.1