Try to fix build with boost-1.70.0

* boost-1.69.0 has "(Deprecated: Use get_executor().)" for get_io_context
  in boost/asio/basic_socket.hpp. So use get_executor().context().

4 files changed, 61 insertions, 1 deletions

diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index e3c319ff273..2c1c0369bde 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2019/06/21 16:02:16 mef Exp $
+$NetBSD: distinfo,v 1.33 2019/07/08 17:50:55 ryoon Exp $
 
 SHA1 (gnuradio-3.7.13.5.tar.gz) = c81a9cb1ec5e9455d885c804ba8fb656c4573b53
 RMD160 (gnuradio-3.7.13.5.tar.gz) = 87786c5f333069c15316c6a45dbce11f329ddac6
@@ -9,3 +9,6 @@ SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7a
 SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = 7e8aa146447fc7ffd006ffd540764ae4b15da2a5
 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 42e0b52d6baba936c03e2414e83a96a19c5331e7
 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49
+SHA1 (patch-gr-blocks_lib_socket__pdu__impl.cc) = 96a0f5c17fdea993531846ef011767c999d17d36
+SHA1 (patch-gr-blocks_lib_tcp__connection.cc) = ef932b7a4d87d7fd2ed6dcff5ab2d75b25095acc
+SHA1 (patch-gr-blocks_lib_tcp__connection.h) = ef6e19424a07f4cf16dbac834bdb48f3f639ebf5
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
new file mode 100644
index 00000000000..b350ef4a3e0
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-blocks_lib_socket__pdu__impl.cc,v 1.1 2019/07/08 17:50:55 ryoon Exp $
+
+* Fix build with boost-1.70.0
+
+--- gr-blocks/lib/socket_pdu_impl.cc.orig	2019-04-20 09:58:09.000000000 +0000
++++ gr-blocks/lib/socket_pdu_impl.cc
+@@ -165,7 +165,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(static_cast<boost::asio::io_context&>(d_acceptor_tcp->get_executor().context()), d_rxbuf.size(), d_tcp_no_delay);
+ 
+       d_acceptor_tcp->async_accept(new_connection->socket(),
+         boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
new file mode 100644
index 00000000000..ef904952a87
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
@@ -0,0 +1,21 @@
+$NetBSD: patch-gr-blocks_lib_tcp__connection.cc,v 1.1 2019/07/08 17:50:55 ryoon Exp $
+
+* Fix build with boost-1.70.0
+
+--- gr-blocks/lib/tcp_connection.cc.orig	2019-04-20 09:58:09.000000000 +0000
++++ gr-blocks/lib/tcp_connection.cc
+@@ -31,12 +31,12 @@
+ namespace gr {
+   namespace blocks {
+ 
+-    tcp_connection::sptr tcp_connection::make(boost::asio::io_service& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
++    tcp_connection::sptr tcp_connection::make(boost::asio::io_context& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
+     {
+       return sptr(new tcp_connection(io_service, MTU, no_delay));
+     }
+ 
+-    tcp_connection::tcp_connection(boost::asio::io_service& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
++    tcp_connection::tcp_connection(boost::asio::io_context& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
+       : d_socket(io_service)
+       , d_block(NULL)
+       , d_no_delay(no_delay)
diff --git a/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
new file mode 100644
index 00000000000..c5a0e727958
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-gr-blocks_lib_tcp__connection.h,v 1.1 2019/07/08 17:50:55 ryoon Exp $
+
+* Fix build with boost-1.70.0
+
+--- gr-blocks/lib/tcp_connection.h.orig	2019-04-20 09:58:09.000000000 +0000
++++ gr-blocks/lib/tcp_connection.h
+@@ -42,12 +42,12 @@ namespace gr {
+       basic_block *d_block;
+       bool d_no_delay;
+ 
+-      tcp_connection(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false);
++      tcp_connection(boost::asio::io_context& io_service, int MTU=10000, bool no_delay=false);
+ 
+     public:
+       typedef boost::shared_ptr<tcp_connection> sptr;
+ 
+-      static sptr make(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false);
++      static sptr make(boost::asio::io_context& io_service, int MTU=10000, bool no_delay=false);
+ 
+       boost::asio::ip::tcp::socket& socket() { return d_socket; };
+