core: fix the missing _1 references

aleksander0m · Aug 4, 2021 · 462cb37 · 462cb37
1 parent c91cd19
commit 462cb37
Show file tree

Hide file tree

Showing 33 changed files with 85 additions and 55 deletions.
diff --git a/lib/extract_metadata_impl.cc b/lib/extract_metadata_impl.cc
@@ -13,6 +13,7 @@
 
 #include "extract_metadata_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -34,7 +35,7 @@ extract_metadata_impl::extract_metadata_impl(pmt::pmt_t key, float scale, float
 {
     message_port_register_in(PMTCONSTSTR__dict());
     set_msg_handler(PMTCONSTSTR__dict(),
-                    boost::bind(&extract_metadata_impl::handle_msg, this, _1));
+                    boost::bind(&extract_metadata_impl::handle_msg, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__msg());
 }
 

diff --git a/lib/message_counter_impl.cc b/lib/message_counter_impl.cc
@@ -13,6 +13,7 @@
 
 #include "message_counter_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -35,7 +36,7 @@ message_counter_impl::message_counter_impl(std::string name)
 {
     message_port_register_in(PMTCONSTSTR__msg());
     set_msg_handler(PMTCONSTSTR__msg(),
-                    boost::bind(&message_counter_impl::handle_msg, this, _1));
+                    boost::bind(&message_counter_impl::handle_msg, this, std::placeholders::_1));
 }
 
 /**

diff --git a/lib/message_emitter_impl.cc b/lib/message_emitter_impl.cc
@@ -13,6 +13,7 @@
 
 #include "message_emitter_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -33,7 +34,7 @@ message_emitter_impl::message_emitter_impl(pmt::pmt_t msg)
 {
     message_port_register_in(PMTCONSTSTR__emit());
     set_msg_handler(PMTCONSTSTR__emit(),
-                    boost::bind(&message_emitter_impl::emit, this, _1));
+                    boost::bind(&message_emitter_impl::emit, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__msg());
 }
 
@@ -49,7 +50,7 @@ message_emitter_impl::~message_emitter_impl() {}
 bool message_emitter_impl::stop()
 {
     GR_LOG_INFO(d_logger, boost::format("Message emitter sent %d messages") % d_n_msgs);
-    
+
     return true;
 }
 

diff --git a/lib/message_gate_impl.cc b/lib/message_gate_impl.cc
@@ -13,6 +13,7 @@
 
 #include "message_gate_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -33,7 +34,7 @@ message_gate_impl::message_gate_impl(bool enabled)
 {
     message_port_register_in(PMTCONSTSTR__in());
     set_msg_handler(PMTCONSTSTR__in(),
-                    boost::bind(&message_gate_impl::handle_msg, this, _1));
+                    boost::bind(&message_gate_impl::handle_msg, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__out());
 }
 

diff --git a/lib/message_keep_1_in_n_impl.cc b/lib/message_keep_1_in_n_impl.cc
@@ -13,6 +13,7 @@
 
 #include "message_keep_1_in_n_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -39,7 +40,7 @@ message_keep_1_in_n_impl::message_keep_1_in_n_impl(uint32_t n)
 
     message_port_register_in(PMTCONSTSTR__in());
     set_msg_handler(PMTCONSTSTR__in(),
-                    boost::bind(&message_keep_1_in_n_impl::handle_msg, this, _1));
+                    boost::bind(&message_keep_1_in_n_impl::handle_msg, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__out());
 }
 

diff --git a/lib/msg_drop_random_impl.cc b/lib/msg_drop_random_impl.cc
@@ -13,6 +13,7 @@
 
 #include "msg_drop_random_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -36,7 +37,7 @@ msg_drop_random_impl::msg_drop_random_impl(float p_drop, uint64_t seed)
 {
     message_port_register_in(PMTCONSTSTR__pdu_in());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&msg_drop_random_impl::handle_msg, this, _1));
+                    boost::bind(&msg_drop_random_impl::handle_msg, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__pdu_out());
 }
 

diff --git a/lib/pack_unpack_impl.cc b/lib/pack_unpack_impl.cc
@@ -13,6 +13,7 @@
 
 #include "pack_unpack_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -32,7 +33,7 @@ pack_unpack_impl::pack_unpack_impl(uint32_t mode, uint32_t bit_order)
 {
     message_port_register_in(PMTCONSTSTR__pdu_in());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pack_unpack_impl::handle_msg, this, _1));
+                    boost::bind(&pack_unpack_impl::handle_msg, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__pdu_out());
 
     if (d_mode == MODE_UNPACK_BYTE) {

diff --git a/lib/pdu_add_noise_impl.cc b/lib/pdu_add_noise_impl.cc
@@ -13,6 +13,7 @@
 
 #include "pdu_add_noise_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -39,7 +40,7 @@ pdu_add_noise_impl::pdu_add_noise_impl(
     set_noise_level(noise_level);
     message_port_register_in(PMTCONSTSTR__pdu_in());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_add_noise_impl::handle_msg, this, _1));
+                    boost::bind(&pdu_add_noise_impl::handle_msg, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__pdu_out());
 }
 

diff --git a/lib/pdu_align_impl.cc b/lib/pdu_align_impl.cc
@@ -15,6 +15,7 @@
 #include <gnuradio/io_signature.h>
 #include <pdu_utils/constants.h>
 #include <volk/volk.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -82,7 +83,7 @@ pdu_align_impl::pdu_align_impl(std::string syncwords,
     message_port_register_in(PMTCONSTSTR__pdu_in());
     message_port_register_out(PMTCONSTSTR__pdu_out());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_align_impl::pdu_handler, this, _1));
+                    boost::bind(&pdu_align_impl::pdu_handler, this, std::placeholders::_1));
 }
 
 /*

diff --git a/lib/pdu_binary_tools_impl.cc b/lib/pdu_binary_tools_impl.cc
@@ -14,6 +14,7 @@
 #include "pdu_binary_tools_impl.h"
 #include "pdu_utils/constants.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -48,53 +49,53 @@ pdu_binary_tools_impl::pdu_binary_tools_impl(uint8_t mode)
         GR_LOG_DEBUG(d_logger, "pdu binary tools in BIT FLIP mode");
         set_msg_handler(
             PMTCONSTSTR__pdu_in(),
-            boost::bind(&pdu_binary_tools_impl::handle_msg_bit_flip, this, _1));
+            boost::bind(&pdu_binary_tools_impl::handle_msg_bit_flip, this, std::placeholders::_1));
         break;
     }
     case pdu_binary_tools::TO_NRZ: {
         GR_LOG_DEBUG(d_logger, "pdu binary tools in TO NRZ mode");
         set_msg_handler(PMTCONSTSTR__pdu_in(),
-                        boost::bind(&pdu_binary_tools_impl::handle_msg_to_nrz, this, _1));
+                        boost::bind(&pdu_binary_tools_impl::handle_msg_to_nrz, this, std::placeholders::_1));
         break;
     }
     case pdu_binary_tools::FROM_NRZ: {
         GR_LOG_DEBUG(d_logger, "pdu binary tools in FROM NRZ mode");
         set_msg_handler(
             PMTCONSTSTR__pdu_in(),
-            boost::bind(&pdu_binary_tools_impl::handle_msg_from_nrz, this, _1));
+            boost::bind(&pdu_binary_tools_impl::handle_msg_from_nrz, this, std::placeholders::_1));
         break;
     }
     case pdu_binary_tools::SLICE: {
         GR_LOG_DEBUG(d_logger, "pdu binary tools in SLICE mode");
         set_msg_handler(PMTCONSTSTR__pdu_in(),
-                        boost::bind(&pdu_binary_tools_impl::handle_msg_slice, this, _1));
+                        boost::bind(&pdu_binary_tools_impl::handle_msg_slice, this, std::placeholders::_1));
         break;
     }
     case pdu_binary_tools::ENDIAN_SWAP8: {
         GR_LOG_DEBUG(d_logger, "pdu binary tools in ENDIAN_SWAP8 mode");
         set_msg_handler(
             PMTCONSTSTR__pdu_in(),
-            boost::bind(&pdu_binary_tools_impl::handle_msg_endian8, this, _1));
+            boost::bind(&pdu_binary_tools_impl::handle_msg_endian8, this, std::placeholders::_1));
         break;
     }
     case pdu_binary_tools::MANCHESTER_ENCODE: {
         GR_LOG_DEBUG(d_logger, "pdu binary tools in MANCHESTER_ENCODE mode");
         set_msg_handler(
             PMTCONSTSTR__pdu_in(),
-            boost::bind(&pdu_binary_tools_impl::handle_msg_manchester_encode, this, _1));
+            boost::bind(&pdu_binary_tools_impl::handle_msg_manchester_encode, this, std::placeholders::_1));
         break;
     }
     case pdu_binary_tools::MANCHESTER_DECODE: {
         GR_LOG_DEBUG(d_logger, "pdu binary tools in MANCHESTER_DECODE mode");
         set_msg_handler(
             PMTCONSTSTR__pdu_in(),
-            boost::bind(&pdu_binary_tools_impl::handle_msg_manchester_decode, this, _1));
+            boost::bind(&pdu_binary_tools_impl::handle_msg_manchester_decode, this, std::placeholders::_1));
         break;
     }
     default: {
         set_msg_handler(
             PMTCONSTSTR__pdu_in(),
-            boost::bind(&pdu_binary_tools_impl::handle_msg_passthrough, this, _1));
+            boost::bind(&pdu_binary_tools_impl::handle_msg_passthrough, this, std::placeholders::_1));
     }
     }
 }

diff --git a/lib/pdu_burst_combiner_impl.cc b/lib/pdu_burst_combiner_impl.cc
@@ -17,7 +17,7 @@
 
 #include <gnuradio/blocks/pdu.h>
 #include <cmath>
-
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -40,7 +40,7 @@ pdu_burst_combiner_impl::pdu_burst_combiner_impl()
 
     message_port_register_in(PMTCONSTSTR__pdu_in());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_burst_combiner_impl::handle_pdu, this, _1));
+                    boost::bind(&pdu_burst_combiner_impl::handle_pdu, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__pdu_out());
 }
 

diff --git a/lib/pdu_clock_recovery_impl.cc b/lib/pdu_clock_recovery_impl.cc
@@ -16,6 +16,7 @@
 #include <volk/volk.h>
 
 #include <algorithm>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -72,7 +73,7 @@ pdu_clock_recovery_impl::pdu_clock_recovery_impl(bool binary_slice,
     }
 
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_clock_recovery_impl::pdu_handler, this, _1));
+                    boost::bind(&pdu_clock_recovery_impl::pdu_handler, this, std::placeholders::_1));
 
     init_fast_sinc();
     fft_setup(15);

diff --git a/lib/pdu_complex_to_mag2_impl.cc b/lib/pdu_complex_to_mag2_impl.cc
@@ -13,6 +13,7 @@
 
 #include "pdu_complex_to_mag2_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 #include <volk/volk.h>
 
@@ -35,7 +36,7 @@ pdu_complex_to_mag2_impl::pdu_complex_to_mag2_impl()
     message_port_register_in(PMTCONSTSTR__cpdus());
     message_port_register_out(PMTCONSTSTR__fpdus());
     set_msg_handler(PMTCONSTSTR__cpdus(),
-                    boost::bind(&pdu_complex_to_mag2_impl::handle_pdu, this, _1));
+                    boost::bind(&pdu_complex_to_mag2_impl::handle_pdu, this, std::placeholders::_1));
 }
 
 /*

diff --git a/lib/pdu_downsample_impl.cc b/lib/pdu_downsample_impl.cc
@@ -14,6 +14,7 @@
 #include "pdu_downsample_impl.h"
 #include "pdu_utils/constants.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -38,7 +39,7 @@ pdu_downsample_impl::pdu_downsample_impl(int decimation, int phase)
     message_port_register_in( PMTCONSTSTR__pdu_in() );
     message_port_register_out( PMTCONSTSTR__pdu_out() );
     set_msg_handler( PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_downsample_impl::handle_msg, this, _1));
+                    boost::bind(&pdu_downsample_impl::handle_msg, this, std::placeholders::_1));
 }
 
 /*

diff --git a/lib/pdu_fine_time_measure_impl.cc b/lib/pdu_fine_time_measure_impl.cc
@@ -14,6 +14,7 @@
 #include "pdu_fine_time_measure_impl.h"
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -45,7 +46,7 @@ pdu_fine_time_measure_impl::pdu_fine_time_measure_impl(float pre_burst_time,
     message_port_register_in(PMTCONSTSTR__pdu_in());
     message_port_register_out(PMTCONSTSTR__pdu_out());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_fine_time_measure_impl::pdu_handler, this, _1));
+                    boost::bind(&pdu_fine_time_measure_impl::pdu_handler, this, std::placeholders::_1));
 }
 
 /*

diff --git a/lib/pdu_fir_filter_impl.cc b/lib/pdu_fir_filter_impl.cc
@@ -14,6 +14,7 @@
 #include "pdu_fir_filter_impl.h"
 #include "volk/volk.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -43,7 +44,7 @@ pdu_fir_filter_impl::pdu_fir_filter_impl(int decimation, const std::vector<float
     message_port_register_in(PMTCONSTSTR__pdu_in());
     message_port_register_out(PMTCONSTSTR__pdu_out());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_fir_filter_impl::handle_pdu, this, _1));
+                    boost::bind(&pdu_fir_filter_impl::handle_pdu, this, std::placeholders::_1));
 }
 
 /*

diff --git a/lib/pdu_gmsk_fc_impl.cc b/lib/pdu_gmsk_fc_impl.cc
@@ -17,6 +17,7 @@
 #include <gnuradio/blocks/pdu.h>
 #include <gnuradio/fxpt.h>
 #include <cmath>
+#include <functional>
 
 
 namespace gr {
@@ -50,7 +51,7 @@ pdu_gmsk_fc_impl::pdu_gmsk_fc_impl(float sensitivity, const std::vector<float> t
 
     message_port_register_in(PMTCONSTSTR__pdu_in());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_gmsk_fc_impl::handle_pdu, this, _1));
+                    boost::bind(&pdu_gmsk_fc_impl::handle_pdu, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__pdu_out());
 }
 

diff --git a/lib/pdu_head_tail_impl.cc b/lib/pdu_head_tail_impl.cc
@@ -13,6 +13,7 @@
 
 #include "pdu_head_tail_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -58,7 +59,7 @@ pdu_head_tail_impl::pdu_head_tail_impl(uint32_t input_type,
 
     message_port_register_in(PMTCONSTSTR__pdu_in());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_head_tail_impl::handle_pdu, this, _1));
+                    boost::bind(&pdu_head_tail_impl::handle_pdu, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__head());
     message_port_register_out(PMTCONSTSTR__tail());
 

diff --git a/lib/pdu_length_filter_impl.cc b/lib/pdu_length_filter_impl.cc
@@ -13,6 +13,7 @@
 
 #include "pdu_length_filter_impl.h"
 #include <gnuradio/io_signature.h>
+#include <functional>
 
 namespace gr {
 namespace pdu_utils {
@@ -35,7 +36,7 @@ pdu_length_filter_impl::pdu_length_filter_impl(uint32_t length, bool drop_long)
 {
     message_port_register_in(PMTCONSTSTR__pdu_in());
     set_msg_handler(PMTCONSTSTR__pdu_in(),
-                    boost::bind(&pdu_length_filter_impl::handle_pdu, this, _1));
+                    boost::bind(&pdu_length_filter_impl::handle_pdu, this, std::placeholders::_1));
     message_port_register_out(PMTCONSTSTR__pdu_out());
 }