Skip to content

Commit

Permalink
blocks: simple fix for Boost 1.70.0 in socket_pdu
Browse files Browse the repository at this point in the history
NOTE: There have been multiple fixes proposed, such as
#2451 .
This one is the simplest and most compatible.
  • Loading branch information
michaelld authored and mbr0wn committed May 28, 2019
1 parent f86f1f3 commit c01473b
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion 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
*
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit c01473b

Please sign in to comment.