From 34dea8e38f88007799629d0a56b12dec480b1d21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Jun 2021 14:45:01 +0100 Subject: gentoo resync : 20.06.2021 --- net-wireless/gnuradio/Manifest | 5 - .../gnuradio/files/gnuradio-3.8.2.0-3967.patch | 58 ---- .../files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch | 250 ----------------- .../files/gnuradio-3.8.2.0-lamda-gr-uhd.patch | 98 ------- .../gnuradio-3.8.2.0-lamda-most-components.patch | 290 -------------------- .../gnuradio-3.8.2.0-lamda-set-msg-handlers.patch | 298 --------------------- 6 files changed, 999 deletions(-) delete mode 100644 net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch delete mode 100644 net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch delete mode 100644 net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch delete mode 100644 net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch delete mode 100644 net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch (limited to 'net-wireless/gnuradio') diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 14fe65c930af..b7f82f5420dc 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,8 +1,3 @@ -AUX gnuradio-3.8.2.0-3967.patch 1903 BLAKE2B 7024ab52326b9ff6aa12a924ec527d3c28c4decba669255f7bb099fdb3e21132beb3626af3599e7647e1aa9fbd413fd4391b22bc9c9698fd2727551cc0739497 SHA512 9ea85fc17ae2910c268955097b9e36bd530fce1092451231df6b124f39440b2d03739d98132403d1dccf942346f0cf4a286988d10709d0c64e1fa225daf80a97 -AUX gnuradio-3.8.2.0-lamda-gr-qtgui.patch 11510 BLAKE2B 17154b93d39517cdd0b6607988c60fbc2274644b3b1f0f88fb36f4cb38820365a7c9b1a52ba17f96725d3a1f6596662ebe837f6837a7a67c7d6e8b4b01d2d7ff SHA512 2e2420b65188b88c3b9759cc2feb89c28c9c1cc151ff8555df7cac095f8619445f4594f60fafea6340ae8e3892fe509f66b3f7c8d4bae8bbfd2085ff74f3005c -AUX gnuradio-3.8.2.0-lamda-gr-uhd.patch 3748 BLAKE2B bfda3afe8dcc5b872a86379d6d3aaad53e57ed10aa394f7b36abbe27e69886fe876f5cb9ba03489f5cb4e0362e782f01bacf9956b3709f21ef0c7841ee2b2e04 SHA512 ea69d44b66b2962327141173d4b66add7885f3ece2302fceb3e5cf294f9502b0e6ac34dd28b9b7ff1b3faa024552be70334629c28e596fc4c621f89fec1c4ab5 -AUX gnuradio-3.8.2.0-lamda-most-components.patch 14122 BLAKE2B 30e63140ced2fdfd9712051ae6d758f2de57511bfdea972364c37d70c1eaf6e41921ad4e14e8f005be53016d8613e1c524b529c7b0e2476afc103edb49cfd946 SHA512 86f5f3ed6856fd183e71af1e6a94bc7e4310842f48a1ae7ed85b79d7a1ff86ebe84027bf24c3dc14a47c28335cc5edc321a7fce1ce24bcb26c0d7432e7aab4f7 -AUX gnuradio-3.8.2.0-lamda-set-msg-handlers.patch 14027 BLAKE2B 5a4a248264df514991343c4eb134c3f3fca2c2e11a5b4eeb63eaa1d0d16a45d87b9a9edebbe30dafeec6488926a7be7ab44d8c15b3c5529000fb488dc7b2dff4 SHA512 6d62d0fc8c06d0df6c046fc69c0280ba1dd2a2f409694c48af67cc6ee72b82d492ef86d10f6d44e4a053f54da187a5dcdc370a82358f2a8595bd37dd8d15eb02 DIST gnuradio-3.8.3.1.tar.gz 3394001 BLAKE2B 3d1da3b005e03b01c563c1ce4a323cf14917a59eb4e2d6ff1ec36446c3b5b8786ea521976534003c0c8cb7849ab5ba4647fae4ef5794b138da768ac931dd7119 SHA512 f22311274e93a4c150dff5cb617802fa70f18bc259139be0b41fdaee5d9b95781743f906d6e3833601afe5de2b0476e0daac8f3bc9ea22932a90c875bfe79204 EBUILD gnuradio-3.8.3.1.ebuild 6115 BLAKE2B 95a4129cea2b525222a8cd998765337798aceb7cdf513ddea9d79a69287bb5b9d022121d9e19cc644515616de7f64828a93654ed4e42a39a6ac623a2f416e70a SHA512 00f69d0d140312ae462b26d7deddabd262c9958f76308f3c32b2cd27d418fcb1527cc969af5cf3c0ff6124fd5ce5021c8175b687c1f1881deff4265a872b7135 EBUILD gnuradio-9999.ebuild 5975 BLAKE2B 76f3be3c1c87c7dee97d43ff546f7b589c3986ba085c62e6a5e43e3d9c88f1927195f7714f90d98f55059e2332d67ef522cd2f7629a402d4cb392a3d7038259c SHA512 1dc35be323b616167438dc4c78d6db9c82736de84ea68b4a9a6e7b4168d2b258ba9e0a15b74b079178c532e62dee5dfae0bc2d826b69cb9a5d2c70fdff675bbc diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch deleted file mode 100644 index bee81049e24e..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-3967.patch +++ /dev/null @@ -1,58 +0,0 @@ -From cbcb968358fad56f3646619b258f18b0e6693a07 Mon Sep 17 00:00:00 2001 -From: Jeff Long -Date: Wed, 25 Nov 2020 09:44:55 -0500 -Subject: [PATCH 1/2] Boost placeholder scope required (using - boost::placeholders) - ---- - gnuradio-runtime/include/gnuradio/basic_block.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h -index 1d31e2e9b8..0aace8f38d 100644 ---- a/gnuradio-runtime/include/gnuradio/basic_block.h -+++ b/gnuradio-runtime/include/gnuradio/basic_block.h -@@ -41,7 +41,7 @@ - #include - - namespace gr { -- -+using namespace boost::placeholders; - /*! - * \brief The abstract base class for all signal processing blocks. - * \ingroup internal - -From 951b16756934f28bc3da4b3c442651b2fbe79b05 Mon Sep 17 00:00:00 2001 -From: Jeff Long -Date: Wed, 25 Nov 2020 11:05:56 -0500 -Subject: [PATCH 2/2] boost bind: make placeholder namespace conditional on - boost version - ---- - gnuradio-runtime/include/gnuradio/basic_block.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h -index 0aace8f38d..c57c1cf553 100644 ---- a/gnuradio-runtime/include/gnuradio/basic_block.h -+++ b/gnuradio-runtime/include/gnuradio/basic_block.h -@@ -33,6 +33,9 @@ - #include - #include - #include -+#if (BOOST_VERSION >= 106000) -+#include -+#endif - #include - #include - #include -@@ -41,7 +44,9 @@ - #include - - namespace gr { -+#if (BOOST_VERSION >= 106000) - using namespace boost::placeholders; -+#endif - /*! - * \brief The abstract base class for all signal processing blocks. - * \ingroup internal diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch deleted file mode 100644 index 0057b38836ce..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch +++ /dev/null @@ -1,250 +0,0 @@ -From faa5e19e15f77a0ba5e7f854df6517c280034369 Mon Sep 17 00:00:00 2001 -From: Johannes Demel -Date: Sat, 9 May 2020 15:28:58 +0200 -Subject: [PATCH] msg_handler: Use lambdas in gr-qtgui - -gr-qtgui uses lambdas instead of `boost::bind` to register message -handlers now. This component makes quite heavy use of message handlers. ---- - gr-qtgui/lib/const_sink_c_impl.cc | 3 +-- - gr-qtgui/lib/edit_box_msg_impl.cc | 2 +- - gr-qtgui/lib/freq_sink_c_impl.cc | 6 +++--- - gr-qtgui/lib/freq_sink_f_impl.cc | 6 +++--- - gr-qtgui/lib/histogram_sink_f_impl.cc | 3 +-- - gr-qtgui/lib/sink_c_impl.cc | 2 +- - gr-qtgui/lib/sink_f_impl.cc | 2 +- - gr-qtgui/lib/time_raster_sink_b_impl.cc | 3 +-- - gr-qtgui/lib/time_raster_sink_f_impl.cc | 3 +-- - gr-qtgui/lib/time_sink_c_impl.cc | 2 +- - gr-qtgui/lib/time_sink_f_impl.cc | 2 +- - gr-qtgui/lib/waterfall_sink_c_impl.cc | 9 +++------ - gr-qtgui/lib/waterfall_sink_f_impl.cc | 9 +++------ - 13 files changed, 21 insertions(+), 31 deletions(-) - -diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc -index 852f6ee109..e4b01907f1 100644 ---- a/gr-qtgui/lib/const_sink_c_impl.cc -+++ b/gr-qtgui/lib/const_sink_c_impl.cc -@@ -69,8 +69,7 @@ const_sink_c_impl::const_sink_c_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&const_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - for (int i = 0; i < d_nconnections; i++) { - d_residbufs_real.push_back( -diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc -index 8713aa820e..04f860785a 100644 ---- a/gr-qtgui/lib/edit_box_msg_impl.cc -+++ b/gr-qtgui/lib/edit_box_msg_impl.cc -@@ -158,7 +158,7 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type, - message_port_register_out(d_port); - message_port_register_in(pmt::mp("val")); - -- set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1)); -+ set_msg_handler(pmt::mp("val"), [this](pmt::pmt_t msg) { this->set_value(msg); }); - } - - edit_box_msg_impl::~edit_box_msg_impl() -diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc -index 3a34df6ec6..137bccc3c3 100644 ---- a/gr-qtgui/lib/freq_sink_c_impl.cc -+++ b/gr-qtgui/lib/freq_sink_c_impl.cc -@@ -82,17 +82,17 @@ freq_sink_c_impl::freq_sink_c_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, boost::bind(&freq_sink_c_impl::handle_set_bw, this, _1)); -+ set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); }); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc -index c14bfc31fd..0b1757c03c 100644 ---- a/gr-qtgui/lib/freq_sink_f_impl.cc -+++ b/gr-qtgui/lib/freq_sink_f_impl.cc -@@ -82,17 +82,17 @@ freq_sink_f_impl::freq_sink_f_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, boost::bind(&freq_sink_f_impl::handle_set_bw, this, _1)); -+ set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); }); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc -index d16de932ca..fd357bf40a 100644 ---- a/gr-qtgui/lib/histogram_sink_f_impl.cc -+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc -@@ -81,8 +81,7 @@ histogram_sink_f_impl::histogram_sink_f_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - // +1 for the PDU buffer - for (int i = 0; i < d_nconnections + 1; i++) { -diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc -index d3feb9d16c..8f7ff36ba2 100644 ---- a/gr-qtgui/lib/sink_c_impl.cc -+++ b/gr-qtgui/lib/sink_c_impl.cc -@@ -96,7 +96,7 @@ sink_c_impl::sink_c_impl(int fftsize, - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&sink_c_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc -index 418b630b78..0b1eccad12 100644 ---- a/gr-qtgui/lib/sink_f_impl.cc -+++ b/gr-qtgui/lib/sink_f_impl.cc -@@ -95,7 +95,7 @@ sink_f_impl::sink_f_impl(int fftsize, - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - d_main_gui = NULL; - -diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc -index 045c216b00..063ed09d0c 100644 ---- a/gr-qtgui/lib/time_raster_sink_b_impl.cc -+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc -@@ -83,8 +83,7 @@ time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - d_scale = 1.0f; - -diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc -index d186f319da..df94d217bd 100644 ---- a/gr-qtgui/lib/time_raster_sink_f_impl.cc -+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc -@@ -83,8 +83,7 @@ time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - d_icols = static_cast(ceil(d_cols)); - d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment()); -diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc -index b73a1c1ad3..26dc5d2e32 100644 ---- a/gr-qtgui/lib/time_sink_c_impl.cc -+++ b/gr-qtgui/lib/time_sink_c_impl.cc -@@ -80,7 +80,7 @@ time_sink_c_impl::time_sink_c_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - // +2 for the PDU message buffers - for (unsigned int n = 0; n < d_nconnections + 2; n++) { -diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc -index df13998d75..8f41d02143 100644 ---- a/gr-qtgui/lib/time_sink_f_impl.cc -+++ b/gr-qtgui/lib/time_sink_f_impl.cc -@@ -80,7 +80,7 @@ time_sink_f_impl::time_sink_f_impl(int size, - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - - // +1 for the PDU buffer - for (unsigned int n = 0; n < d_nconnections + 1; n++) { -diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc -index fcf2ed98bc..20cebbcbda 100644 ---- a/gr-qtgui/lib/waterfall_sink_c_impl.cc -+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc -@@ -117,20 +117,17 @@ waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, -- boost::bind(&waterfall_sink_c_impl::handle_set_bw, this, _1)); -+ set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); }); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, -- boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - } - - waterfall_sink_c_impl::~waterfall_sink_c_impl() -diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc -index aa1037a472..4ba6427f08 100644 ---- a/gr-qtgui/lib/waterfall_sink_f_impl.cc -+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc -@@ -115,20 +115,17 @@ waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize, - - // setup bw input port - message_port_register_in(d_port_bw); -- set_msg_handler(d_port_bw, -- boost::bind(&waterfall_sink_f_impl::handle_set_bw, this, _1)); -+ set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); }); - - // setup output message port to post frequency when display is - // double-clicked - message_port_register_out(d_port); - message_port_register_in(d_port); -- set_msg_handler(d_port, -- boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1)); -+ set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); }); - - // setup PDU handling input port - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), -- boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); }); - } - - waterfall_sink_f_impl::~waterfall_sink_f_impl() diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch deleted file mode 100644 index 56787372af0c..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 591c2c16355eb065ff3f51f23d9d6026be188132 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Sat, 22 Aug 2020 14:06:22 +0200 -Subject: [PATCH] msg_handler: Use lambdas in gr-uhd - ---- - gr-uhd/lib/amsg_source_impl.cc | 3 +-- - gr-uhd/lib/usrp_block_impl.cc | 10 ++++++---- - gr-uhd/lib/usrp_block_impl.h | 1 - - gr-uhd/lib/usrp_source_impl.cc | 6 ++++-- - 4 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/gr-uhd/lib/amsg_source_impl.cc b/gr-uhd/lib/amsg_source_impl.cc -index 46d47a5826..e1de62e028 100644 ---- a/gr-uhd/lib/amsg_source_impl.cc -+++ b/gr-uhd/lib/amsg_source_impl.cc -@@ -22,7 +22,6 @@ - - #include "amsg_source_impl.h" - #include "gr_uhd_common.h" --#include - - namespace gr { - namespace uhd { -@@ -44,7 +43,7 @@ amsg_source_impl::amsg_source_impl(const ::uhd::device_addr_t& device_addr, - : _msgq(msgq), _running(true) - { - _dev = ::uhd::usrp::multi_usrp::make(device_addr); -- _amsg_thread = gr::thread::thread(boost::bind(&amsg_source_impl::recv_loop, this)); -+ _amsg_thread = gr::thread::thread([this]() { this->recv_loop(); }); - } - - amsg_source_impl::~amsg_source_impl() -diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc -index e5e1dd9161..8344809837 100644 ---- a/gr-uhd/lib/usrp_block_impl.cc -+++ b/gr-uhd/lib/usrp_block_impl.cc -@@ -21,7 +21,7 @@ - */ - - #include "usrp_block_impl.h" --#include -+#include - - using namespace gr::uhd; - -@@ -139,10 +139,11 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr, - set_msg_handler(pmt::mp("command"), - [this](pmt::pmt_t msg) { this->msg_handler_command(msg); }); - --// cuz we lazy: -+ // because we're highly efficient and adverse to work -+ namespace ph = std::placeholders; - #define REGISTER_CMD_HANDLER(key, _handler) \ -- register_msg_cmd_handler(key, \ -- boost::bind(&usrp_block_impl::_handler, this, _1, _2, _3)) -+ register_msg_cmd_handler( \ -+ key, std::bind(&usrp_block_impl::_handler, this, ph::_1, ph::_2, ph::_3)) - // Register default command handlers: - REGISTER_CMD_HANDLER(cmd_freq_key(), _cmd_handler_freq); - REGISTER_CMD_HANDLER(cmd_gain_key(), _cmd_handler_gain); -@@ -153,6 +154,7 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr, - REGISTER_CMD_HANDLER(cmd_rate_key(), _cmd_handler_rate); - REGISTER_CMD_HANDLER(cmd_bandwidth_key(), _cmd_handler_bw); - REGISTER_CMD_HANDLER(cmd_antenna_key(), _cmd_handler_antenna); -+#undef REGISTER_CMD_HANDLER - } - - usrp_block_impl::~usrp_block_impl() -diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h -index 1dbc3813bd..479b7dcd65 100644 ---- a/gr-uhd/lib/usrp_block_impl.h -+++ b/gr-uhd/lib/usrp_block_impl.h -@@ -26,7 +26,6 @@ - #include - #include - #include --#include - #include - - -diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc -index a2ff0821bd..1e8ef020ab 100644 ---- a/gr-uhd/lib/usrp_source_impl.cc -+++ b/gr-uhd/lib/usrp_source_impl.cc -@@ -57,8 +57,10 @@ usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t& device_addr, - - _samp_rate = this->get_samp_rate(); - _samps_per_packet = 1; -- register_msg_cmd_handler(cmd_tag_key(), -- boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1)); -+ register_msg_cmd_handler( -+ cmd_tag_key(), [this](const pmt::pmt_t& val, int chan, const pmt::pmt_t& msg) { -+ this->_cmd_handler_tag(val); -+ }); - } - - usrp_source_impl::~usrp_source_impl() {} diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch deleted file mode 100644 index ea687a7ed876..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch +++ /dev/null @@ -1,290 +0,0 @@ -From c6e3632952bd3e86e4d8437d7619e7fececb524e Mon Sep 17 00:00:00 2001 -From: Johannes Demel -Date: Sat, 9 May 2020 15:14:37 +0200 -Subject: [PATCH] msg_handler: Use lambdas in most components - -With this commit, all components except gr-qtgui use lambdas instead of -`boost::bind` to register msg handlers. ---- - gr-digital/lib/chunks_to_symbols_impl.cc | 6 ++---- - gr-digital/lib/constellation_receiver_cb_impl.cc | 10 ++++------ - gr-digital/lib/costas_loop_cc_impl.cc | 2 +- - gr-digital/lib/crc32_async_bb_impl.cc | 4 ++-- - gr-digital/lib/header_payload_demux_impl.cc | 5 ++--- - gr-digital/lib/protocol_formatter_async_impl.cc | 3 +-- - gr-fec/lib/async_decoder_impl.cc | 5 ++--- - gr-fec/lib/async_encoder_impl.cc | 5 ++--- - gr-fec/lib/depuncture_bb_impl.cc | 2 +- - gr-fec/lib/puncture_bb_impl.cc | 2 +- - gr-fec/lib/puncture_ff_impl.cc | 2 +- - gr-filter/lib/freq_xlating_fir_filter_impl.cc | 8 ++------ - gr-filter/lib/mmse_resampler_cc_impl.cc | 2 +- - gr-filter/lib/mmse_resampler_ff_impl.cc | 2 +- - gr-uhd/lib/usrp_block_impl.cc | 2 +- - gr-zeromq/lib/pub_msg_sink_impl.cc | 2 +- - gr-zeromq/lib/push_msg_sink_impl.cc | 2 +- - 17 files changed, 26 insertions(+), 38 deletions(-) - -diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc -index 26d590a66e..c2cc99b0c8 100644 ---- a/gr-digital/lib/chunks_to_symbols_impl.cc -+++ b/gr-digital/lib/chunks_to_symbols_impl.cc -@@ -51,10 +51,8 @@ chunks_to_symbols_impl::chunks_to_symbols_impl( - d_symbol_table(symbol_table) - { - this->message_port_register_in(pmt::mp("set_symbol_table")); -- this->set_msg_handler( -- pmt::mp("set_symbol_table"), -- boost::bind( -- &chunks_to_symbols_impl::handle_set_symbol_table, this, _1)); -+ this->set_msg_handler(pmt::mp("set_symbol_table"), -+ [this](pmt::pmt_t msg) { this->handle_set_symbol_table(msg); }); - } - - template -diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc -index 7fb7559d5e..1c160ff1bb 100644 ---- a/gr-digital/lib/constellation_receiver_cb_impl.cc -+++ b/gr-digital/lib/constellation_receiver_cb_impl.cc -@@ -61,14 +61,12 @@ constellation_receiver_cb_impl::constellation_receiver_cb_impl( - "This receiver only works with constellations of dimension 1."); - - message_port_register_in(pmt::mp("set_constellation")); -- set_msg_handler( -- pmt::mp("set_constellation"), -- boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, this, _1)); -+ set_msg_handler(pmt::mp("set_constellation"), -+ [this](pmt::pmt_t msg) { this->handle_set_constellation(msg); }); - - message_port_register_in(pmt::mp("rotate_phase")); -- set_msg_handler( -- pmt::mp("rotate_phase"), -- boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, this, _1)); -+ set_msg_handler(pmt::mp("rotate_phase"), -+ [this](pmt::pmt_t msg) { this->handle_rotate_phase(msg); }); - } - - constellation_receiver_cb_impl::~constellation_receiver_cb_impl() {} -diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc -index c3b30834eb..b1a0e67caa 100644 ---- a/gr-digital/lib/costas_loop_cc_impl.cc -+++ b/gr-digital/lib/costas_loop_cc_impl.cc -@@ -82,7 +82,7 @@ costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order, bool use_snr) - - message_port_register_in(pmt::mp("noise")); - set_msg_handler(pmt::mp("noise"), -- boost::bind(&costas_loop_cc_impl::handle_set_noise, this, _1)); -+ [this](pmt::pmt_t msg) { this->handle_set_noise(msg); }); - } - - costas_loop_cc_impl::~costas_loop_cc_impl() {} -diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc -index bffbb2a737..230decc2ae 100644 ---- a/gr-digital/lib/crc32_async_bb_impl.cc -+++ b/gr-digital/lib/crc32_async_bb_impl.cc -@@ -48,9 +48,9 @@ crc32_async_bb_impl::crc32_async_bb_impl(bool check) - message_port_register_out(d_out_port); - - if (check) -- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this, _1)); -+ set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->check(msg); }); - else -- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this, _1)); -+ set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->calc(msg); }); - } - - crc32_async_bb_impl::~crc32_async_bb_impl() {} -diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc -index 98c805fb20..5dc65f422b 100644 ---- a/gr-digital/lib/header_payload_demux_impl.cc -+++ b/gr-digital/lib/header_payload_demux_impl.cc -@@ -150,9 +150,8 @@ header_payload_demux_impl::header_payload_demux_impl( - } - set_tag_propagation_policy(TPP_DONT); - message_port_register_in(msg_port_id()); -- set_msg_handler( -- msg_port_id(), -- boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1)); -+ set_msg_handler(msg_port_id(), -+ [this](pmt::pmt_t msg) { this->parse_header_data_msg(msg); }); - for (size_t i = 0; i < special_tags.size(); i++) { - d_special_tags.push_back(pmt::string_to_symbol(special_tags[i])); - d_special_tags_last_value.push_back(pmt::PMT_NIL); -diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc -index 84b693745d..08e324ecfb 100644 ---- a/gr-digital/lib/protocol_formatter_async_impl.cc -+++ b/gr-digital/lib/protocol_formatter_async_impl.cc -@@ -54,8 +54,7 @@ protocol_formatter_async_impl::protocol_formatter_async_impl( - message_port_register_out(d_hdr_port); - message_port_register_out(d_pld_port); - -- set_msg_handler(d_in_port, -- boost::bind(&protocol_formatter_async_impl::append, this, _1)); -+ set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->append(msg); }); - } - - protocol_formatter_async_impl::~protocol_formatter_async_impl() {} -diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc -index e7a668c832..c907b297a5 100644 ---- a/gr-fec/lib/async_decoder_impl.cc -+++ b/gr-fec/lib/async_decoder_impl.cc -@@ -64,11 +64,10 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder, - - if (d_packed) { - d_pack = new blocks::kernel::pack_k_bits(8); -- set_msg_handler(d_in_port, -- boost::bind(&async_decoder_impl::decode_packed, this, _1)); -+ set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->decode_packed(msg); }); - } else { - set_msg_handler(d_in_port, -- boost::bind(&async_decoder_impl::decode_unpacked, this, _1)); -+ [this](pmt::pmt_t msg) { this->decode_unpacked(msg); }); - } - - // The maximum frame size is set by the initial frame size of the decoder. -diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc -index 811d55601f..2e8fd62d12 100644 ---- a/gr-fec/lib/async_encoder_impl.cc -+++ b/gr-fec/lib/async_encoder_impl.cc -@@ -63,8 +63,7 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, - message_port_register_out(d_out_port); - - if (d_packed) { -- set_msg_handler(d_in_port, -- boost::bind(&async_encoder_impl::encode_packed, this, _1)); -+ set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->encode_packed(msg); }); - - d_unpack = new blocks::kernel::unpack_k_bits(8); - -@@ -74,7 +73,7 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, - - } else { - set_msg_handler(d_in_port, -- boost::bind(&async_encoder_impl::encode_unpacked, this, _1)); -+ [this](pmt::pmt_t msg) { this->encode_unpacked(msg); }); - } - - if (d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) { -diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc -index 27d00bb5bb..59ed44dd8a 100644 ---- a/gr-fec/lib/depuncture_bb_impl.cc -+++ b/gr-fec/lib/depuncture_bb_impl.cc -@@ -74,7 +74,7 @@ depuncture_bb_impl::depuncture_bb_impl(int puncsize, int puncpat, int delay, cha - set_fixed_rate(true); - set_relative_rate((uint64_t)d_puncsize, (uint64_t)(d_puncsize - d_puncholes)); - set_output_multiple(d_puncsize); -- // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, _1)); -+ // set_msg_handler(, [this](pmt::pmt_t msg) { this->catch_msg(msg); }); - } - - depuncture_bb_impl::~depuncture_bb_impl() {} -diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc -index a365d6a69f..1f328c2214 100644 ---- a/gr-fec/lib/puncture_bb_impl.cc -+++ b/gr-fec/lib/puncture_bb_impl.cc -@@ -72,7 +72,7 @@ puncture_bb_impl::puncture_bb_impl(int puncsize, int puncpat, int delay) - set_fixed_rate(true); - set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize); - set_output_multiple(d_puncsize - d_puncholes); -- // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, this, _1)); -+ // set_msg_handler(, [this](pmt::pmt_t msg) { this->catch_msg(msg); }); - } - - puncture_bb_impl::~puncture_bb_impl() {} -diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc -index c95288d691..31c686ea4c 100644 ---- a/gr-fec/lib/puncture_ff_impl.cc -+++ b/gr-fec/lib/puncture_ff_impl.cc -@@ -72,7 +72,7 @@ puncture_ff_impl::puncture_ff_impl(int puncsize, int puncpat, int delay) - set_fixed_rate(true); - set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize); - set_output_multiple(d_puncsize - d_puncholes); -- // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, this, _1)); -+ // set_msg_handler(, [this](pmt::pmt_t msg) { this->catch_msg(msg); }); - } - - puncture_ff_impl::~puncture_ff_impl() {} -diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.cc b/gr-filter/lib/freq_xlating_fir_filter_impl.cc -index 8ddc967ba1..1050fb82a5 100644 ---- a/gr-filter/lib/freq_xlating_fir_filter_impl.cc -+++ b/gr-filter/lib/freq_xlating_fir_filter_impl.cc -@@ -67,12 +67,8 @@ freq_xlating_fir_filter_impl::freq_xlating_fir_filter_impl( - this->build_composite_fir(); - - this->message_port_register_in(pmt::mp("freq")); -- this->set_msg_handler( -- pmt::mp("freq"), -- boost::bind( -- &freq_xlating_fir_filter_impl::handle_set_center_freq, -- this, -- _1)); -+ this->set_msg_handler(pmt::mp("freq"), -+ [this](pmt::pmt_t msg) { this->handle_set_center_freq(msg); }); - } - - template -diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc -index 59f9eacfab..9ca62082ce 100644 ---- a/gr-filter/lib/mmse_resampler_cc_impl.cc -+++ b/gr-filter/lib/mmse_resampler_cc_impl.cc -@@ -53,7 +53,7 @@ mmse_resampler_cc_impl::mmse_resampler_cc_impl(float phase_shift, float resamp_r - set_inverse_relative_rate(d_mu_inc); - message_port_register_in(pmt::intern("msg_in")); - set_msg_handler(pmt::intern("msg_in"), -- boost::bind(&mmse_resampler_cc_impl::handle_msg, this, _1)); -+ [this](pmt::pmt_t msg) { this->handle_msg(msg); }); - } - - mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; } -diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc -index 342d9f7678..312a6a8755 100644 ---- a/gr-filter/lib/mmse_resampler_ff_impl.cc -+++ b/gr-filter/lib/mmse_resampler_ff_impl.cc -@@ -54,7 +54,7 @@ mmse_resampler_ff_impl::mmse_resampler_ff_impl(float phase_shift, float resamp_r - - message_port_register_in(pmt::intern("msg_in")); - set_msg_handler(pmt::intern("msg_in"), -- boost::bind(&mmse_resampler_ff_impl::handle_msg, this, _1)); -+ [this](pmt::pmt_t msg) { this->handle_msg(msg); }); - } - - mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; } -diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc -index 4f030159ff..e5e1dd9161 100644 ---- a/gr-uhd/lib/usrp_block_impl.cc -+++ b/gr-uhd/lib/usrp_block_impl.cc -@@ -137,7 +137,7 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr, - // Set up message ports: - message_port_register_in(pmt::mp("command")); - set_msg_handler(pmt::mp("command"), -- boost::bind(&usrp_block_impl::msg_handler_command, this, _1)); -+ [this](pmt::pmt_t msg) { this->msg_handler_command(msg); }); - - // cuz we lazy: - #define REGISTER_CMD_HANDLER(key, _handler) \ -diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc -index b5da7421ef..3973b8f835 100644 ---- a/gr-zeromq/lib/pub_msg_sink_impl.cc -+++ b/gr-zeromq/lib/pub_msg_sink_impl.cc -@@ -62,7 +62,7 @@ pub_msg_sink_impl::pub_msg_sink_impl(char* address, int timeout, bool bind) - } - - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&pub_msg_sink_impl::handler, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handler(msg); }); - } - - pub_msg_sink_impl::~pub_msg_sink_impl() -diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc -index 4140781ab9..fee734753b 100644 ---- a/gr-zeromq/lib/push_msg_sink_impl.cc -+++ b/gr-zeromq/lib/push_msg_sink_impl.cc -@@ -62,7 +62,7 @@ push_msg_sink_impl::push_msg_sink_impl(char* address, int timeout, bool bind) - } - - message_port_register_in(pmt::mp("in")); -- set_msg_handler(pmt::mp("in"), boost::bind(&push_msg_sink_impl::handler, this, _1)); -+ set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handler(msg); }); - } - - push_msg_sink_impl::~push_msg_sink_impl() diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch deleted file mode 100644 index 2d91fe2cce26..000000000000 --- a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch +++ /dev/null @@ -1,298 +0,0 @@ -From 7c841011f9316d4aae068b444c995829e09278d7 Mon Sep 17 00:00:00 2001 -From: Johannes Demel -Date: Sat, 9 May 2020 14:25:32 +0200 -Subject: [PATCH] msg_handler: Use lambdas to set msg handlers - -With this commit, all calls to `set_msg_handler` in `gr-blocks` use -lambdas. This helps to use `std::function` instead of `boost::function`. ---- - gnuradio-runtime/lib/block.cc | 3 +-- - gr-blocks/lib/copy_impl.cc | 2 +- - gr-blocks/lib/message_debug_impl.cc | 6 +++--- - gr-blocks/lib/message_strobe_impl.cc | 3 +-- - gr-blocks/lib/message_strobe_random_impl.cc | 3 +-- - gr-blocks/lib/multiply_matrix_impl.cc | 7 ++----- - gr-blocks/lib/mute_impl.cc | 2 +- - gr-blocks/lib/nop_impl.cc | 3 +-- - gr-blocks/lib/pdu_filter_impl.cc | 2 +- - gr-blocks/lib/pdu_remove_impl.cc | 2 +- - gr-blocks/lib/pdu_set_impl.cc | 3 ++- - gr-blocks/lib/random_pdu_impl.cc | 2 +- - gr-blocks/lib/repeat_impl.cc | 2 +- - gr-blocks/lib/socket_pdu_impl.cc | 8 ++++---- - gr-blocks/lib/tagged_stream_multiply_length_impl.cc | 5 ++--- - gr-blocks/lib/tuntap_pdu_impl.cc | 2 +- - 16 files changed, 24 insertions(+), 31 deletions(-) - -diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc -index 5914283908..beec8c470c 100644 ---- a/gnuradio-runtime/lib/block.cc -+++ b/gnuradio-runtime/lib/block.cc -@@ -61,9 +61,8 @@ block::block(const std::string& name, - { - global_block_registry.register_primitive(alias(), this); - message_port_register_in(d_system_port); -- set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1)); -- - configure_default_loggers(d_logger, d_debug_logger, symbol_name()); -+ set_msg_handler(d_system_port, [this](pmt::pmt_t msg) { this->system_handler(msg); }); - } - - block::~block() { global_block_registry.unregister_primitive(symbol_name()); } -diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc -index c377e57b1e..4c97d07a76 100644 ---- a/gr-blocks/lib/copy_impl.cc -+++ b/gr-blocks/lib/copy_impl.cc -@@ -44,7 +44,7 @@ copy_impl::copy_impl(size_t itemsize) - d_enabled(true) - { - message_port_register_in(pmt::mp("en")); -- set_msg_handler(pmt::mp("en"), boost::bind(©_impl::handle_enable, this, _1)); -+ set_msg_handler(pmt::mp("en"), [this](pmt::pmt_t msg) { this->handle_enable(msg); }); - } - - copy_impl::~copy_impl() {} -diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc -index a8c84aa509..719fbd818a 100644 ---- a/gr-blocks/lib/message_debug_impl.cc -+++ b/gr-blocks/lib/message_debug_impl.cc -@@ -90,14 +90,14 @@ message_debug_impl::message_debug_impl() - : block("message_debug", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)) - { - message_port_register_in(pmt::mp("print")); -- set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1)); -+ set_msg_handler(pmt::mp("print"), [this](pmt::pmt_t msg) { this->print(msg); }); - - message_port_register_in(pmt::mp("store")); -- set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1)); -+ set_msg_handler(pmt::mp("store"), [this](pmt::pmt_t msg) { this->store(msg); }); - - message_port_register_in(pmt::mp("print_pdu")); - set_msg_handler(pmt::mp("print_pdu"), -- boost::bind(&message_debug_impl::print_pdu, this, _1)); -+ [this](pmt::pmt_t msg) { this->print_pdu(msg); }); - } - - message_debug_impl::~message_debug_impl() {} -diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc -index 038eeae5a1..67a95be8f2 100644 ---- a/gr-blocks/lib/message_strobe_impl.cc -+++ b/gr-blocks/lib/message_strobe_impl.cc -@@ -53,8 +53,7 @@ message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, long period_ms) - message_port_register_out(d_port); - - message_port_register_in(pmt::mp("set_msg")); -- set_msg_handler(pmt::mp("set_msg"), -- boost::bind(&message_strobe_impl::set_msg, this, _1)); -+ set_msg_handler(pmt::mp("set_msg"), [this](pmt::pmt_t msg) { this->set_msg(msg); }); - } - - message_strobe_impl::~message_strobe_impl() {} -diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc -index 0ab5d6adc7..1b8deca952 100644 ---- a/gr-blocks/lib/message_strobe_random_impl.cc -+++ b/gr-blocks/lib/message_strobe_random_impl.cc -@@ -74,8 +74,7 @@ message_strobe_random_impl::message_strobe_random_impl( - new gr::thread::thread(boost::bind(&message_strobe_random_impl::run, this))); - - message_port_register_in(pmt::mp("set_msg")); -- set_msg_handler(pmt::mp("set_msg"), -- boost::bind(&message_strobe_random_impl::set_msg, this, _1)); -+ set_msg_handler(pmt::mp("set_msg"), [this](pmt::pmt_t msg) { this->set_msg(msg); }); - } - - long message_strobe_random_impl::next_delay() -diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc -index e1b9c746c6..03e7894536 100644 ---- a/gr-blocks/lib/multiply_matrix_impl.cc -+++ b/gr-blocks/lib/multiply_matrix_impl.cc -@@ -235,9 +235,7 @@ multiply_matrix_impl::multiply_matrix_impl( - - pmt::pmt_t port_name = pmt::string_to_symbol("set_A"); - message_port_register_in(port_name); -- set_msg_handler( -- port_name, -- boost::bind(&multiply_matrix_impl::msg_handler_A, this, _1)); -+ set_msg_handler(port_name, [this](pmt::pmt_t msg) { this->msg_handler_A(msg); }); - } - - template <> -@@ -256,8 +254,7 @@ multiply_matrix_impl::multiply_matrix_impl( - - pmt::pmt_t port_name = pmt::string_to_symbol("set_A"); - message_port_register_in(port_name); -- set_msg_handler(port_name, -- boost::bind(&multiply_matrix_impl::msg_handler_A, this, _1)); -+ set_msg_handler(port_name, [this](pmt::pmt_t msg) { this->msg_handler_A(msg); }); - } - - -diff --git a/gr-blocks/lib/mute_impl.cc b/gr-blocks/lib/mute_impl.cc -index bd65ce2075..c9a1d200c8 100644 ---- a/gr-blocks/lib/mute_impl.cc -+++ b/gr-blocks/lib/mute_impl.cc -@@ -48,7 +48,7 @@ mute_impl::mute_impl(bool mute) - { - this->message_port_register_in(pmt::intern("set_mute")); - this->set_msg_handler(pmt::intern("set_mute"), -- boost::bind(&mute_impl::set_mute_pmt, this, _1)); -+ [this](pmt::pmt_t msg) { this->set_mute_pmt(msg); }); - } - - template -diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc -index db216d97a4..4e1e887f42 100644 ---- a/gr-blocks/lib/nop_impl.cc -+++ b/gr-blocks/lib/nop_impl.cc -@@ -26,7 +26,6 @@ - - #include "nop_impl.h" - #include --#include - - namespace gr { - namespace blocks { -@@ -45,7 +44,7 @@ nop_impl::nop_impl(size_t sizeof_stream_item) - // Arrange to have count_received_msgs called when messages are received. - message_port_register_in(pmt::mp("port")); - set_msg_handler(pmt::mp("port"), -- boost::bind(&nop_impl::count_received_msgs, this, _1)); -+ [this](pmt::pmt_t msg) { this->count_received_msgs(msg); }); - } - - nop_impl::~nop_impl() {} -diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc -index b0748eec02..760027a78c 100644 ---- a/gr-blocks/lib/pdu_filter_impl.cc -+++ b/gr-blocks/lib/pdu_filter_impl.cc -@@ -45,7 +45,7 @@ pdu_filter_impl::pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert) - message_port_register_out(pdu::pdu_port_id()); - message_port_register_in(pdu::pdu_port_id()); - set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&pdu_filter_impl::handle_msg, this, _1)); -+ [this](pmt::pmt_t msg) { this->handle_msg(msg); }); - } - - void pdu_filter_impl::handle_msg(pmt::pmt_t pdu) -diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc -index 19cc4dc76a..58277ca0d0 100644 ---- a/gr-blocks/lib/pdu_remove_impl.cc -+++ b/gr-blocks/lib/pdu_remove_impl.cc -@@ -43,7 +43,7 @@ pdu_remove_impl::pdu_remove_impl(pmt::pmt_t k) - message_port_register_out(pdu::pdu_port_id()); - message_port_register_in(pdu::pdu_port_id()); - set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&pdu_remove_impl::handle_msg, this, _1)); -+ [this](pmt::pmt_t msg) { this->handle_msg(msg); }); - } - - void pdu_remove_impl::handle_msg(pmt::pmt_t pdu) -diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc -index 40fbc3cd83..61f1bb1284 100644 ---- a/gr-blocks/lib/pdu_set_impl.cc -+++ b/gr-blocks/lib/pdu_set_impl.cc -@@ -43,7 +43,8 @@ pdu_set_impl::pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v) - { - message_port_register_out(pdu::pdu_port_id()); - message_port_register_in(pdu::pdu_port_id()); -- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1)); -+ set_msg_handler(pdu::pdu_port_id(), -+ [this](pmt::pmt_t msg) { this->handle_msg(msg); }); - } - - void pdu_set_impl::handle_msg(pmt::pmt_t pdu) -diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc -index 75d825aefa..5207a779d6 100644 ---- a/gr-blocks/lib/random_pdu_impl.cc -+++ b/gr-blocks/lib/random_pdu_impl.cc -@@ -53,7 +53,7 @@ random_pdu_impl::random_pdu_impl(int min_items, - message_port_register_out(pdu::pdu_port_id()); - message_port_register_in(pmt::mp("generate")); - set_msg_handler(pmt::mp("generate"), -- boost::bind(&random_pdu_impl::generate_pdu, this, _1)); -+ [this](pmt::pmt_t msg) { this->generate_pdu(msg); }); - if (length_modulo < 1) - throw std::runtime_error("length_module must be >= 1"); - if (max_items < length_modulo) -diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc -index 189fbc8948..7262b11a2e 100644 ---- a/gr-blocks/lib/repeat_impl.cc -+++ b/gr-blocks/lib/repeat_impl.cc -@@ -45,7 +45,7 @@ repeat_impl::repeat_impl(size_t itemsize, int interp) - { - message_port_register_in(pmt::mp("interpolation")); - set_msg_handler(pmt::mp("interpolation"), -- boost::bind(&repeat_impl::msg_set_interpolation, this, _1)); -+ [this](pmt::pmt_t msg) { this->msg_set_interpolation(msg); }); - } - - void repeat_impl::msg_set_interpolation(pmt::pmt_t msg) -diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc -index df69f07ad2..edf572e76c 100644 ---- a/gr-blocks/lib/socket_pdu_impl.cc -+++ b/gr-blocks/lib/socket_pdu_impl.cc -@@ -101,7 +101,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - start_tcp_accept(); - - set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&socket_pdu_impl::tcp_server_send, this, _1)); -+ [this](pmt::pmt_t msg) { this->tcp_server_send(msg); }); - } else if (type == "TCP_CLIENT") { - boost::system::error_code error = boost::asio::error::host_not_found; - d_tcp_socket.reset(new boost::asio::ip::tcp::socket(d_io_service)); -@@ -111,7 +111,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay)); - - set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&socket_pdu_impl::tcp_client_send, this, _1)); -+ [this](pmt::pmt_t msg) { this->tcp_client_send(msg); }); - - d_tcp_socket->async_read_some( - boost::asio::buffer(d_rxbuf), -@@ -131,7 +131,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - boost::asio::placeholders::bytes_transferred)); - - set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&socket_pdu_impl::udp_send, this, _1)); -+ [this](pmt::pmt_t msg) { this->udp_send(msg); }); - } else if (type == "UDP_CLIENT") { - d_udp_socket.reset( - new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); -@@ -144,7 +144,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type, - boost::asio::placeholders::bytes_transferred)); - - set_msg_handler(pdu::pdu_port_id(), -- boost::bind(&socket_pdu_impl::udp_send, this, _1)); -+ [this](pmt::pmt_t msg) { this->udp_send(msg); }); - } else - throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type"); - -diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc -index 30f4c46dc6..2266c01fe3 100644 ---- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc -+++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc -@@ -49,9 +49,8 @@ tagged_stream_multiply_length_impl::tagged_stream_multiply_length_impl( - set_tag_propagation_policy(TPP_DONT); - set_relative_rate(1, 1); - message_port_register_in(pmt::intern("set_scalar")); -- set_msg_handler( -- pmt::intern("set_scalar"), -- boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1)); -+ set_msg_handler(pmt::intern("set_scalar"), -+ [this](pmt::pmt_t msg) { this->set_scalar_pmt(msg); }); - } - - tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl() {} -diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc -index 4343ae1dc3..19742235d9 100644 ---- a/gr-blocks/lib/tuntap_pdu_impl.cc -+++ b/gr-blocks/lib/tuntap_pdu_impl.cc -@@ -96,7 +96,7 @@ tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU, bool istunflag) - - // set up input message port - message_port_register_in(pdu::pdu_port_id()); -- set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1)); -+ set_msg_handler(pdu::pdu_port_id(), [this](pmt::pmt_t msg) { this->send(msg); }); - } - - int tuntap_pdu_impl::tun_alloc(char* dev, int flags) -- cgit v1.2.3