diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2019-05-23 10:26:00 -0400 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-05-28 16:32:30 -0700 |
| commit | c01473bf00b73ba1dd72813fbc4c4c5d0f66d339 (patch) | |
| tree | 8a3ade9636a19f891d9673429bfb275615acb626 | |
| parent | f86f1f34befb8b278185d3e6cae22051e5300246 (diff) | |
blocks: simple fix for Boost 1.70.0 in socket_pdu
NOTE: There have been multiple fixes proposed, such as
https://github.com/gnuradio/gnuradio/pull/2451 .
This one is the simplest and most compatible.
| -rw-r--r-- | gr-blocks/lib/socket_pdu_impl.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc index e20f1478f0..168d74ebb2 100644 --- a/gr-blocks/lib/socket_pdu_impl.cc +++ b/gr-blocks/lib/socket_pdu_impl.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2013 Free Software Foundation, Inc. + * Copyright 2013,2019 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -165,7 +165,11 @@ namespace gr { void socket_pdu_impl::start_tcp_accept() { +#if (BOOST_VERSION >= 107000) + tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay); +#else tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay); +#endif d_acceptor_tcp->async_accept(new_connection->socket(), boost::bind(&socket_pdu_impl::handle_tcp_accept, this, |