1From 5d4c317a372c77aa70df6ab3403d161cd41a7d17 Mon Sep 17 00:00:00 2001 2From: ponce <matteo.bernardini@gmail.com> 3Date: Sun, 17 May 2020 14:02:57 +0200 4Subject: [PATCH] boost: qualify placeholders with their full namespace. 5 6This is needed with boost >= 1.73.0. 7 8[Upstream status: https://github.com/gnuradio/gnuradio/pull/3566] 9 10Signed-off-by: ponce <matteo.bernardini@gmail.com> 11Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> 12--- 13 .../(exported from wiki) Message Passing.txt | 8 +++--- 14 gnuradio-runtime/lib/block.cc | 3 ++- 15 gr-blocks/lib/copy_impl.cc | 4 ++- 16 gr-blocks/lib/message_debug_impl.cc | 13 +++++++--- 17 gr-blocks/lib/message_strobe_impl.cc | 5 ++-- 18 gr-blocks/lib/message_strobe_random_impl.cc | 5 ++-- 19 gr-blocks/lib/multiply_matrix_impl.cc | 11 +++++--- 20 gr-blocks/lib/mute_impl.cc | 5 ++-- 21 gr-blocks/lib/nop_impl.cc | 5 ++-- 22 gr-blocks/lib/pdu_filter_impl.cc | 5 ++-- 23 gr-blocks/lib/pdu_remove_impl.cc | 5 ++-- 24 gr-blocks/lib/pdu_set_impl.cc | 4 ++- 25 gr-blocks/lib/random_pdu_impl.cc | 5 ++-- 26 gr-blocks/lib/repeat_impl.cc | 5 ++-- 27 gr-blocks/lib/socket_pdu_impl.cc | 18 ++++++++----- 28 .../lib/tagged_stream_multiply_length_impl.cc | 7 +++--- 29 gr-blocks/lib/tuntap_pdu_impl.cc | 3 ++- 30 gr-digital/lib/chunks_to_symbols_impl.cc | 5 ++-- 31 .../lib/constellation_receiver_cb_impl.cc | 14 ++++++----- 32 gr-digital/lib/costas_loop_cc_impl.cc | 4 ++- 33 gr-digital/lib/crc32_async_bb_impl.cc | 8 ++++-- 34 gr-digital/lib/header_payload_demux_impl.cc | 7 +++--- 35 .../lib/protocol_formatter_async_impl.cc | 4 ++- 36 gr-fec/lib/async_decoder_impl.cc | 8 ++++-- 37 gr-fec/lib/async_encoder_impl.cc | 8 ++++-- 38 gr-fec/lib/depuncture_bb_impl.cc | 4 ++- 39 gr-fec/lib/puncture_bb_impl.cc | 4 ++- 40 gr-fec/lib/puncture_ff_impl.cc | 4 ++- 41 gr-filter/lib/freq_xlating_fir_filter_impl.cc | 2 +- 42 gr-filter/lib/mmse_resampler_cc_impl.cc | 5 ++-- 43 gr-filter/lib/mmse_resampler_ff_impl.cc | 5 ++-- 44 gr-qtgui/lib/const_sink_c_impl.cc | 5 ++-- 45 gr-qtgui/lib/edit_box_msg_impl.cc | 4 ++- 46 gr-qtgui/lib/freq_sink_c_impl.cc | 12 ++++++--- 47 gr-qtgui/lib/freq_sink_f_impl.cc | 12 ++++++--- 48 gr-qtgui/lib/histogram_sink_f_impl.cc | 5 ++-- 49 gr-qtgui/lib/sink_c_impl.cc | 4 ++- 50 gr-qtgui/lib/sink_f_impl.cc | 4 ++- 51 gr-qtgui/lib/time_raster_sink_b_impl.cc | 4 ++- 52 gr-qtgui/lib/time_raster_sink_f_impl.cc | 4 ++- 53 gr-qtgui/lib/time_sink_c_impl.cc | 4 ++- 54 gr-qtgui/lib/time_sink_f_impl.cc | 4 ++- 55 gr-qtgui/lib/waterfall_sink_c_impl.cc | 13 +++++++--- 56 gr-qtgui/lib/waterfall_sink_f_impl.cc | 13 +++++++--- 57 gr-uhd/lib/usrp_block_impl.cc | 25 ++++++++++++------- 58 gr-uhd/lib/usrp_source_impl.cc | 5 ++-- 59 gr-zeromq/lib/pub_msg_sink_impl.cc | 4 ++- 60 gr-zeromq/lib/push_msg_sink_impl.cc | 4 ++- 61 48 files changed, 213 insertions(+), 106 deletions(-) 62 63diff --git a/docs/usage-manual/(exported from wiki) Message Passing.txt b/docs/usage-manual/(exported from wiki) Message Passing.txt 64index 4654bd5da..551e71022 100644 65--- a/docs/usage-manual/(exported from wiki) Message Passing.txt 66+++ b/docs/usage-manual/(exported from wiki) Message Passing.txt 67@@ -94,7 +94,7 @@ must then bind this port to the message handler. For this, we use 68 Boost's 'bind' function: 69 70 set_msg_handler(pmt::pmt_t port_id, 71- boost::bind(&block_class::message_handler_function, this, _1)); 72+ boost::bind(&block_class::message_handler_function, this, boost::placeholders::_1)); 73 74 In Python: 75 76@@ -241,15 +241,15 @@ The constructor of this block looks like this: 77 { 78 message_port_register_in(pmt::mp("print")); 79 set_msg_handler(pmt::mp("print"), 80- boost::bind(&message_debug_impl::print, this, _1)); 81+ boost::bind(&message_debug_impl::print, this, boost::placeholders::_1)); 82 83 message_port_register_in(pmt::mp("store")); 84 set_msg_handler(pmt::mp("store"), 85- boost::bind(&message_debug_impl::store, this, _1)); 86+ boost::bind(&message_debug_impl::store, this, boost::placeholders::_1)); 87 88 message_port_register_in(pmt::mp("print_pdu")); 89 set_msg_handler(pmt::mp("print_pdu"), 90- boost::bind(&message_debug_impl::print_pdu, this, _1)); 91+ boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1)); 92 } 93 </syntaxhighlight> 94 95diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc 96index 591428390..fca4cab97 100644 97--- a/gnuradio-runtime/lib/block.cc 98+++ b/gnuradio-runtime/lib/block.cc 99@@ -61,7 +61,8 @@ block::block(const std::string& name, 100 { 101 global_block_registry.register_primitive(alias(), this); 102 message_port_register_in(d_system_port); 103- set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1)); 104+ set_msg_handler(d_system_port, 105+ boost::bind(&block::system_handler, this, boost::placeholders::_1)); 106 107 configure_default_loggers(d_logger, d_debug_logger, symbol_name()); 108 } 109diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc 110index c377e57b1..b55196c24 100644 111--- a/gr-blocks/lib/copy_impl.cc 112+++ b/gr-blocks/lib/copy_impl.cc 113@@ -44,7 +44,9 @@ copy_impl::copy_impl(size_t itemsize) 114 d_enabled(true) 115 { 116 message_port_register_in(pmt::mp("en")); 117- set_msg_handler(pmt::mp("en"), boost::bind(©_impl::handle_enable, this, _1)); 118+ set_msg_handler( 119+ pmt::mp("en"), 120+ boost::bind(©_impl::handle_enable, this, boost::placeholders::_1)); 121 } 122 123 copy_impl::~copy_impl() {} 124diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc 125index a8c84aa50..916f97ca3 100644 126--- a/gr-blocks/lib/message_debug_impl.cc 127+++ b/gr-blocks/lib/message_debug_impl.cc 128@@ -90,14 +90,19 @@ message_debug_impl::message_debug_impl() 129 : block("message_debug", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)) 130 { 131 message_port_register_in(pmt::mp("print")); 132- set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1)); 133+ set_msg_handler( 134+ pmt::mp("print"), 135+ boost::bind(&message_debug_impl::print, this, boost::placeholders::_1)); 136 137 message_port_register_in(pmt::mp("store")); 138- set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1)); 139+ set_msg_handler( 140+ pmt::mp("store"), 141+ boost::bind(&message_debug_impl::store, this, boost::placeholders::_1)); 142 143 message_port_register_in(pmt::mp("print_pdu")); 144- set_msg_handler(pmt::mp("print_pdu"), 145- boost::bind(&message_debug_impl::print_pdu, this, _1)); 146+ set_msg_handler( 147+ pmt::mp("print_pdu"), 148+ boost::bind(&message_debug_impl::print_pdu, this, boost::placeholders::_1)); 149 } 150 151 message_debug_impl::~message_debug_impl() {} 152diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc 153index 038eeae5a..d131b8166 100644 154--- a/gr-blocks/lib/message_strobe_impl.cc 155+++ b/gr-blocks/lib/message_strobe_impl.cc 156@@ -53,8 +53,9 @@ message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, long period_ms) 157 message_port_register_out(d_port); 158 159 message_port_register_in(pmt::mp("set_msg")); 160- set_msg_handler(pmt::mp("set_msg"), 161- boost::bind(&message_strobe_impl::set_msg, this, _1)); 162+ set_msg_handler( 163+ pmt::mp("set_msg"), 164+ boost::bind(&message_strobe_impl::set_msg, this, boost::placeholders::_1)); 165 } 166 167 message_strobe_impl::~message_strobe_impl() {} 168diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc 169index 0ab5d6adc..53e641fba 100644 170--- a/gr-blocks/lib/message_strobe_random_impl.cc 171+++ b/gr-blocks/lib/message_strobe_random_impl.cc 172@@ -74,8 +74,9 @@ message_strobe_random_impl::message_strobe_random_impl( 173 new gr::thread::thread(boost::bind(&message_strobe_random_impl::run, this))); 174 175 message_port_register_in(pmt::mp("set_msg")); 176- set_msg_handler(pmt::mp("set_msg"), 177- boost::bind(&message_strobe_random_impl::set_msg, this, _1)); 178+ set_msg_handler( 179+ pmt::mp("set_msg"), 180+ boost::bind(&message_strobe_random_impl::set_msg, this, boost::placeholders::_1)); 181 } 182 183 long message_strobe_random_impl::next_delay() 184diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc 185index e1b9c746c..e38953bab 100644 186--- a/gr-blocks/lib/multiply_matrix_impl.cc 187+++ b/gr-blocks/lib/multiply_matrix_impl.cc 188@@ -235,9 +235,10 @@ multiply_matrix_impl<gr_complex>::multiply_matrix_impl( 189 190 pmt::pmt_t port_name = pmt::string_to_symbol("set_A"); 191 message_port_register_in(port_name); 192- set_msg_handler( 193- port_name, 194- boost::bind(&multiply_matrix_impl<gr_complex>::msg_handler_A, this, _1)); 195+ set_msg_handler(port_name, 196+ boost::bind(&multiply_matrix_impl<gr_complex>::msg_handler_A, 197+ this, 198+ boost::placeholders::_1)); 199 } 200 201 template <> 202@@ -257,7 +258,9 @@ multiply_matrix_impl<float>::multiply_matrix_impl( 203 pmt::pmt_t port_name = pmt::string_to_symbol("set_A"); 204 message_port_register_in(port_name); 205 set_msg_handler(port_name, 206- boost::bind(&multiply_matrix_impl<float>::msg_handler_A, this, _1)); 207+ boost::bind(&multiply_matrix_impl<float>::msg_handler_A, 208+ this, 209+ boost::placeholders::_1)); 210 } 211 212 213diff --git a/gr-blocks/lib/mute_impl.cc b/gr-blocks/lib/mute_impl.cc 214index bd65ce207..5c732f8f4 100644 215--- a/gr-blocks/lib/mute_impl.cc 216+++ b/gr-blocks/lib/mute_impl.cc 217@@ -47,8 +47,9 @@ mute_impl<T>::mute_impl(bool mute) 218 d_mute(mute) 219 { 220 this->message_port_register_in(pmt::intern("set_mute")); 221- this->set_msg_handler(pmt::intern("set_mute"), 222- boost::bind(&mute_impl<T>::set_mute_pmt, this, _1)); 223+ this->set_msg_handler( 224+ pmt::intern("set_mute"), 225+ boost::bind(&mute_impl<T>::set_mute_pmt, this, boost::placeholders::_1)); 226 } 227 228 template <class T> 229diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc 230index db216d97a..e9baee587 100644 231--- a/gr-blocks/lib/nop_impl.cc 232+++ b/gr-blocks/lib/nop_impl.cc 233@@ -44,8 +44,9 @@ nop_impl::nop_impl(size_t sizeof_stream_item) 234 { 235 // Arrange to have count_received_msgs called when messages are received. 236 message_port_register_in(pmt::mp("port")); 237- set_msg_handler(pmt::mp("port"), 238- boost::bind(&nop_impl::count_received_msgs, this, _1)); 239+ set_msg_handler( 240+ pmt::mp("port"), 241+ boost::bind(&nop_impl::count_received_msgs, this, boost::placeholders::_1)); 242 } 243 244 nop_impl::~nop_impl() {} 245diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc 246index b0748eec0..63cfe47e4 100644 247--- a/gr-blocks/lib/pdu_filter_impl.cc 248+++ b/gr-blocks/lib/pdu_filter_impl.cc 249@@ -44,8 +44,9 @@ pdu_filter_impl::pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert) 250 { 251 message_port_register_out(pdu::pdu_port_id()); 252 message_port_register_in(pdu::pdu_port_id()); 253- set_msg_handler(pdu::pdu_port_id(), 254- boost::bind(&pdu_filter_impl::handle_msg, this, _1)); 255+ set_msg_handler( 256+ pdu::pdu_port_id(), 257+ boost::bind(&pdu_filter_impl::handle_msg, this, boost::placeholders::_1)); 258 } 259 260 void pdu_filter_impl::handle_msg(pmt::pmt_t pdu) 261diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc 262index 19cc4dc76..2b97f827b 100644 263--- a/gr-blocks/lib/pdu_remove_impl.cc 264+++ b/gr-blocks/lib/pdu_remove_impl.cc 265@@ -42,8 +42,9 @@ pdu_remove_impl::pdu_remove_impl(pmt::pmt_t k) 266 { 267 message_port_register_out(pdu::pdu_port_id()); 268 message_port_register_in(pdu::pdu_port_id()); 269- set_msg_handler(pdu::pdu_port_id(), 270- boost::bind(&pdu_remove_impl::handle_msg, this, _1)); 271+ set_msg_handler( 272+ pdu::pdu_port_id(), 273+ boost::bind(&pdu_remove_impl::handle_msg, this, boost::placeholders::_1)); 274 } 275 276 void pdu_remove_impl::handle_msg(pmt::pmt_t pdu) 277diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc 278index 40fbc3cd8..af59ef70f 100644 279--- a/gr-blocks/lib/pdu_set_impl.cc 280+++ b/gr-blocks/lib/pdu_set_impl.cc 281@@ -43,7 +43,9 @@ pdu_set_impl::pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v) 282 { 283 message_port_register_out(pdu::pdu_port_id()); 284 message_port_register_in(pdu::pdu_port_id()); 285- set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1)); 286+ set_msg_handler( 287+ pdu::pdu_port_id(), 288+ boost::bind(&pdu_set_impl::handle_msg, this, boost::placeholders::_1)); 289 } 290 291 void pdu_set_impl::handle_msg(pmt::pmt_t pdu) 292diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc 293index 75d825aef..6c142c353 100644 294--- a/gr-blocks/lib/random_pdu_impl.cc 295+++ b/gr-blocks/lib/random_pdu_impl.cc 296@@ -52,8 +52,9 @@ random_pdu_impl::random_pdu_impl(int min_items, 297 { 298 message_port_register_out(pdu::pdu_port_id()); 299 message_port_register_in(pmt::mp("generate")); 300- set_msg_handler(pmt::mp("generate"), 301- boost::bind(&random_pdu_impl::generate_pdu, this, _1)); 302+ set_msg_handler( 303+ pmt::mp("generate"), 304+ boost::bind(&random_pdu_impl::generate_pdu, this, boost::placeholders::_1)); 305 if (length_modulo < 1) 306 throw std::runtime_error("length_module must be >= 1"); 307 if (max_items < length_modulo) 308diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc 309index 189fbc894..d6569625d 100644 310--- a/gr-blocks/lib/repeat_impl.cc 311+++ b/gr-blocks/lib/repeat_impl.cc 312@@ -44,8 +44,9 @@ repeat_impl::repeat_impl(size_t itemsize, int interp) 313 d_interp(interp) 314 { 315 message_port_register_in(pmt::mp("interpolation")); 316- set_msg_handler(pmt::mp("interpolation"), 317- boost::bind(&repeat_impl::msg_set_interpolation, this, _1)); 318+ set_msg_handler( 319+ pmt::mp("interpolation"), 320+ boost::bind(&repeat_impl::msg_set_interpolation, this, boost::placeholders::_1)); 321 } 322 323 void repeat_impl::msg_set_interpolation(pmt::pmt_t msg) 324diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc 325index df69f07ad..163eec3a6 100644 326--- a/gr-blocks/lib/socket_pdu_impl.cc 327+++ b/gr-blocks/lib/socket_pdu_impl.cc 328@@ -101,7 +101,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, 329 start_tcp_accept(); 330 331 set_msg_handler(pdu::pdu_port_id(), 332- boost::bind(&socket_pdu_impl::tcp_server_send, this, _1)); 333+ boost::bind(&socket_pdu_impl::tcp_server_send, 334+ this, 335+ boost::placeholders::_1)); 336 } else if (type == "TCP_CLIENT") { 337 boost::system::error_code error = boost::asio::error::host_not_found; 338 d_tcp_socket.reset(new boost::asio::ip::tcp::socket(d_io_service)); 339@@ -111,7 +113,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, 340 d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay)); 341 342 set_msg_handler(pdu::pdu_port_id(), 343- boost::bind(&socket_pdu_impl::tcp_client_send, this, _1)); 344+ boost::bind(&socket_pdu_impl::tcp_client_send, 345+ this, 346+ boost::placeholders::_1)); 347 348 d_tcp_socket->async_read_some( 349 boost::asio::buffer(d_rxbuf), 350@@ -130,8 +134,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, 351 boost::asio::placeholders::error, 352 boost::asio::placeholders::bytes_transferred)); 353 354- set_msg_handler(pdu::pdu_port_id(), 355- boost::bind(&socket_pdu_impl::udp_send, this, _1)); 356+ set_msg_handler( 357+ pdu::pdu_port_id(), 358+ boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1)); 359 } else if (type == "UDP_CLIENT") { 360 d_udp_socket.reset( 361 new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint)); 362@@ -143,8 +148,9 @@ socket_pdu_impl::socket_pdu_impl(std::string type, 363 boost::asio::placeholders::error, 364 boost::asio::placeholders::bytes_transferred)); 365 366- set_msg_handler(pdu::pdu_port_id(), 367- boost::bind(&socket_pdu_impl::udp_send, this, _1)); 368+ set_msg_handler( 369+ pdu::pdu_port_id(), 370+ boost::bind(&socket_pdu_impl::udp_send, this, boost::placeholders::_1)); 371 } else 372 throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type"); 373 374diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 375index 30f4c46dc..34b95d647 100644 376--- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 377+++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 378@@ -49,9 +49,10 @@ tagged_stream_multiply_length_impl::tagged_stream_multiply_length_impl( 379 set_tag_propagation_policy(TPP_DONT); 380 set_relative_rate(1, 1); 381 message_port_register_in(pmt::intern("set_scalar")); 382- set_msg_handler( 383- pmt::intern("set_scalar"), 384- boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1)); 385+ set_msg_handler(pmt::intern("set_scalar"), 386+ boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, 387+ this, 388+ boost::placeholders::_1)); 389 } 390 391 tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl() {} 392diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc 393index 4343ae1dc..0d9d7e28c 100644 394--- a/gr-blocks/lib/tuntap_pdu_impl.cc 395+++ b/gr-blocks/lib/tuntap_pdu_impl.cc 396@@ -96,7 +96,8 @@ tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU, bool istunflag) 397 398 // set up input message port 399 message_port_register_in(pdu::pdu_port_id()); 400- set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1)); 401+ set_msg_handler(pdu::pdu_port_id(), 402+ boost::bind(&tuntap_pdu_impl::send, this, boost::placeholders::_1)); 403 } 404 405 int tuntap_pdu_impl::tun_alloc(char* dev, int flags) 406diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc 407index 26d590a66..a6810a69e 100644 408--- a/gr-digital/lib/chunks_to_symbols_impl.cc 409+++ b/gr-digital/lib/chunks_to_symbols_impl.cc 410@@ -53,8 +53,9 @@ chunks_to_symbols_impl<IN_T, OUT_T>::chunks_to_symbols_impl( 411 this->message_port_register_in(pmt::mp("set_symbol_table")); 412 this->set_msg_handler( 413 pmt::mp("set_symbol_table"), 414- boost::bind( 415- &chunks_to_symbols_impl<IN_T, OUT_T>::handle_set_symbol_table, this, _1)); 416+ boost::bind(&chunks_to_symbols_impl<IN_T, OUT_T>::handle_set_symbol_table, 417+ this, 418+ boost::placeholders::_1)); 419 } 420 421 template <class IN_T, class OUT_T> 422diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc 423index 7fb7559d5..7e216ece5 100644 424--- a/gr-digital/lib/constellation_receiver_cb_impl.cc 425+++ b/gr-digital/lib/constellation_receiver_cb_impl.cc 426@@ -61,14 +61,16 @@ constellation_receiver_cb_impl::constellation_receiver_cb_impl( 427 "This receiver only works with constellations of dimension 1."); 428 429 message_port_register_in(pmt::mp("set_constellation")); 430- set_msg_handler( 431- pmt::mp("set_constellation"), 432- boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, this, _1)); 433+ set_msg_handler(pmt::mp("set_constellation"), 434+ boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, 435+ this, 436+ boost::placeholders::_1)); 437 438 message_port_register_in(pmt::mp("rotate_phase")); 439- set_msg_handler( 440- pmt::mp("rotate_phase"), 441- boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, this, _1)); 442+ set_msg_handler(pmt::mp("rotate_phase"), 443+ boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, 444+ this, 445+ boost::placeholders::_1)); 446 } 447 448 constellation_receiver_cb_impl::~constellation_receiver_cb_impl() {} 449diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc 450index c3b30834e..e1229e6f4 100644 451--- a/gr-digital/lib/costas_loop_cc_impl.cc 452+++ b/gr-digital/lib/costas_loop_cc_impl.cc 453@@ -82,7 +82,9 @@ costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order, bool use_snr) 454 455 message_port_register_in(pmt::mp("noise")); 456 set_msg_handler(pmt::mp("noise"), 457- boost::bind(&costas_loop_cc_impl::handle_set_noise, this, _1)); 458+ boost::bind(&costas_loop_cc_impl::handle_set_noise, 459+ this, 460+ boost::placeholders::_1)); 461 } 462 463 costas_loop_cc_impl::~costas_loop_cc_impl() {} 464diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc 465index bffbb2a73..66143866c 100644 466--- a/gr-digital/lib/crc32_async_bb_impl.cc 467+++ b/gr-digital/lib/crc32_async_bb_impl.cc 468@@ -48,9 +48,13 @@ crc32_async_bb_impl::crc32_async_bb_impl(bool check) 469 message_port_register_out(d_out_port); 470 471 if (check) 472- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this, _1)); 473+ set_msg_handler( 474+ d_in_port, 475+ boost::bind(&crc32_async_bb_impl::check, this, boost::placeholders::_1)); 476 else 477- set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this, _1)); 478+ set_msg_handler( 479+ d_in_port, 480+ boost::bind(&crc32_async_bb_impl::calc, this, boost::placeholders::_1)); 481 } 482 483 crc32_async_bb_impl::~crc32_async_bb_impl() {} 484diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc 485index 98c805fb2..7cc1e0a4e 100644 486--- a/gr-digital/lib/header_payload_demux_impl.cc 487+++ b/gr-digital/lib/header_payload_demux_impl.cc 488@@ -150,9 +150,10 @@ header_payload_demux_impl::header_payload_demux_impl( 489 } 490 set_tag_propagation_policy(TPP_DONT); 491 message_port_register_in(msg_port_id()); 492- set_msg_handler( 493- msg_port_id(), 494- boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1)); 495+ set_msg_handler(msg_port_id(), 496+ boost::bind(&header_payload_demux_impl::parse_header_data_msg, 497+ this, 498+ boost::placeholders::_1)); 499 for (size_t i = 0; i < special_tags.size(); i++) { 500 d_special_tags.push_back(pmt::string_to_symbol(special_tags[i])); 501 d_special_tags_last_value.push_back(pmt::PMT_NIL); 502diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc 503index 84b693745..c08bbb9ae 100644 504--- a/gr-digital/lib/protocol_formatter_async_impl.cc 505+++ b/gr-digital/lib/protocol_formatter_async_impl.cc 506@@ -55,7 +55,9 @@ protocol_formatter_async_impl::protocol_formatter_async_impl( 507 message_port_register_out(d_pld_port); 508 509 set_msg_handler(d_in_port, 510- boost::bind(&protocol_formatter_async_impl::append, this, _1)); 511+ boost::bind(&protocol_formatter_async_impl::append, 512+ this, 513+ boost::placeholders::_1)); 514 } 515 516 protocol_formatter_async_impl::~protocol_formatter_async_impl() {} 517diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc 518index e7a668c83..5d68d13ae 100644 519--- a/gr-fec/lib/async_decoder_impl.cc 520+++ b/gr-fec/lib/async_decoder_impl.cc 521@@ -65,10 +65,14 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder, 522 if (d_packed) { 523 d_pack = new blocks::kernel::pack_k_bits(8); 524 set_msg_handler(d_in_port, 525- boost::bind(&async_decoder_impl::decode_packed, this, _1)); 526+ boost::bind(&async_decoder_impl::decode_packed, 527+ this, 528+ boost::placeholders::_1)); 529 } else { 530 set_msg_handler(d_in_port, 531- boost::bind(&async_decoder_impl::decode_unpacked, this, _1)); 532+ boost::bind(&async_decoder_impl::decode_unpacked, 533+ this, 534+ boost::placeholders::_1)); 535 } 536 537 // The maximum frame size is set by the initial frame size of the decoder. 538diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc 539index 811d55601..506ae5c7e 100644 540--- a/gr-fec/lib/async_encoder_impl.cc 541+++ b/gr-fec/lib/async_encoder_impl.cc 542@@ -64,7 +64,9 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, 543 544 if (d_packed) { 545 set_msg_handler(d_in_port, 546- boost::bind(&async_encoder_impl::encode_packed, this, _1)); 547+ boost::bind(&async_encoder_impl::encode_packed, 548+ this, 549+ boost::placeholders::_1)); 550 551 d_unpack = new blocks::kernel::unpack_k_bits(8); 552 553@@ -74,7 +76,9 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder, 554 555 } else { 556 set_msg_handler(d_in_port, 557- boost::bind(&async_encoder_impl::encode_unpacked, this, _1)); 558+ boost::bind(&async_encoder_impl::encode_unpacked, 559+ this, 560+ boost::placeholders::_1)); 561 } 562 563 if (d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) { 564diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc 565index 27d00bb5b..f64dad45f 100644 566--- a/gr-fec/lib/depuncture_bb_impl.cc 567+++ b/gr-fec/lib/depuncture_bb_impl.cc 568@@ -74,7 +74,9 @@ depuncture_bb_impl::depuncture_bb_impl(int puncsize, int puncpat, int delay, cha 569 set_fixed_rate(true); 570 set_relative_rate((uint64_t)d_puncsize, (uint64_t)(d_puncsize - d_puncholes)); 571 set_output_multiple(d_puncsize); 572- // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, _1)); 573+ // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, 574+ // this, 575+ // boost::placeholders::_1)); 576 } 577 578 depuncture_bb_impl::~depuncture_bb_impl() {} 579diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc 580index a365d6a69..f2078d8c5 100644 581--- a/gr-fec/lib/puncture_bb_impl.cc 582+++ b/gr-fec/lib/puncture_bb_impl.cc 583@@ -72,7 +72,9 @@ puncture_bb_impl::puncture_bb_impl(int puncsize, int puncpat, int delay) 584 set_fixed_rate(true); 585 set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize); 586 set_output_multiple(d_puncsize - d_puncholes); 587- // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, this, _1)); 588+ // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, 589+ // this, 590+ // boost::placeholders::_1)); 591 } 592 593 puncture_bb_impl::~puncture_bb_impl() {} 594diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc 595index c95288d69..95fb649a8 100644 596--- a/gr-fec/lib/puncture_ff_impl.cc 597+++ b/gr-fec/lib/puncture_ff_impl.cc 598@@ -72,7 +72,9 @@ puncture_ff_impl::puncture_ff_impl(int puncsize, int puncpat, int delay) 599 set_fixed_rate(true); 600 set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize); 601 set_output_multiple(d_puncsize - d_puncholes); 602- // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, this, _1)); 603+ // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, 604+ // this, 605+ // boost::placeholders::_1)); 606 } 607 608 puncture_ff_impl::~puncture_ff_impl() {} 609diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.cc b/gr-filter/lib/freq_xlating_fir_filter_impl.cc 610index 8ddc967ba..50ec58947 100644 611--- a/gr-filter/lib/freq_xlating_fir_filter_impl.cc 612+++ b/gr-filter/lib/freq_xlating_fir_filter_impl.cc 613@@ -72,7 +72,7 @@ freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::freq_xlating_fir_filter_impl( 614 boost::bind( 615 &freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::handle_set_center_freq, 616 this, 617- _1)); 618+ boost::placeholders::_1)); 619 } 620 621 template <class IN_T, class OUT_T, class TAP_T> 622diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc 623index 59f9eacfa..bdce51716 100644 624--- a/gr-filter/lib/mmse_resampler_cc_impl.cc 625+++ b/gr-filter/lib/mmse_resampler_cc_impl.cc 626@@ -52,8 +52,9 @@ mmse_resampler_cc_impl::mmse_resampler_cc_impl(float phase_shift, float resamp_r 627 628 set_inverse_relative_rate(d_mu_inc); 629 message_port_register_in(pmt::intern("msg_in")); 630- set_msg_handler(pmt::intern("msg_in"), 631- boost::bind(&mmse_resampler_cc_impl::handle_msg, this, _1)); 632+ set_msg_handler( 633+ pmt::intern("msg_in"), 634+ boost::bind(&mmse_resampler_cc_impl::handle_msg, this, boost::placeholders::_1)); 635 } 636 637 mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; } 638diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc 639index 342d9f767..3d7272711 100644 640--- a/gr-filter/lib/mmse_resampler_ff_impl.cc 641+++ b/gr-filter/lib/mmse_resampler_ff_impl.cc 642@@ -53,8 +53,9 @@ mmse_resampler_ff_impl::mmse_resampler_ff_impl(float phase_shift, float resamp_r 643 set_inverse_relative_rate(d_mu_inc); 644 645 message_port_register_in(pmt::intern("msg_in")); 646- set_msg_handler(pmt::intern("msg_in"), 647- boost::bind(&mmse_resampler_ff_impl::handle_msg, this, _1)); 648+ set_msg_handler( 649+ pmt::intern("msg_in"), 650+ boost::bind(&mmse_resampler_ff_impl::handle_msg, this, boost::placeholders::_1)); 651 } 652 653 mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; } 654diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc 655index 852f6ee10..04d421d03 100644 656--- a/gr-qtgui/lib/const_sink_c_impl.cc 657+++ b/gr-qtgui/lib/const_sink_c_impl.cc 658@@ -69,8 +69,9 @@ const_sink_c_impl::const_sink_c_impl(int size, 659 660 // setup PDU handling input port 661 message_port_register_in(pmt::mp("in")); 662- set_msg_handler(pmt::mp("in"), 663- boost::bind(&const_sink_c_impl::handle_pdus, this, _1)); 664+ set_msg_handler( 665+ pmt::mp("in"), 666+ boost::bind(&const_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); 667 668 for (int i = 0; i < d_nconnections; i++) { 669 d_residbufs_real.push_back( 670diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc 671index 8713aa820..39546cbf3 100644 672--- a/gr-qtgui/lib/edit_box_msg_impl.cc 673+++ b/gr-qtgui/lib/edit_box_msg_impl.cc 674@@ -158,7 +158,9 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type, 675 message_port_register_out(d_port); 676 message_port_register_in(pmt::mp("val")); 677 678- set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1)); 679+ set_msg_handler( 680+ pmt::mp("val"), 681+ boost::bind(&edit_box_msg_impl::set_value, this, boost::placeholders::_1)); 682 } 683 684 edit_box_msg_impl::~edit_box_msg_impl() 685diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc 686index 3a34df6ec..fe231699f 100644 687--- a/gr-qtgui/lib/freq_sink_c_impl.cc 688+++ b/gr-qtgui/lib/freq_sink_c_impl.cc 689@@ -82,17 +82,23 @@ freq_sink_c_impl::freq_sink_c_impl(int fftsize, 690 691 // setup bw input port 692 message_port_register_in(d_port_bw); 693- set_msg_handler(d_port_bw, boost::bind(&freq_sink_c_impl::handle_set_bw, this, _1)); 694+ set_msg_handler( 695+ d_port_bw, 696+ boost::bind(&freq_sink_c_impl::handle_set_bw, this, boost::placeholders::_1)); 697 698 // setup output message port to post frequency when display is 699 // double-clicked 700 message_port_register_out(d_port); 701 message_port_register_in(d_port); 702- set_msg_handler(d_port, boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1)); 703+ set_msg_handler( 704+ d_port, 705+ boost::bind(&freq_sink_c_impl::handle_set_freq, this, boost::placeholders::_1)); 706 707 // setup PDU handling input port 708 message_port_register_in(pmt::mp("in")); 709- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_c_impl::handle_pdus, this, _1)); 710+ set_msg_handler( 711+ pmt::mp("in"), 712+ boost::bind(&freq_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); 713 714 d_main_gui = NULL; 715 716diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc 717index c14bfc31f..7090d8699 100644 718--- a/gr-qtgui/lib/freq_sink_f_impl.cc 719+++ b/gr-qtgui/lib/freq_sink_f_impl.cc 720@@ -82,17 +82,23 @@ freq_sink_f_impl::freq_sink_f_impl(int fftsize, 721 722 // setup bw input port 723 message_port_register_in(d_port_bw); 724- set_msg_handler(d_port_bw, boost::bind(&freq_sink_f_impl::handle_set_bw, this, _1)); 725+ set_msg_handler( 726+ d_port_bw, 727+ boost::bind(&freq_sink_f_impl::handle_set_bw, this, boost::placeholders::_1)); 728 729 // setup output message port to post frequency when display is 730 // double-clicked 731 message_port_register_out(d_port); 732 message_port_register_in(d_port); 733- set_msg_handler(d_port, boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1)); 734+ set_msg_handler( 735+ d_port, 736+ boost::bind(&freq_sink_f_impl::handle_set_freq, this, boost::placeholders::_1)); 737 738 // setup PDU handling input port 739 message_port_register_in(pmt::mp("in")); 740- set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_f_impl::handle_pdus, this, _1)); 741+ set_msg_handler( 742+ pmt::mp("in"), 743+ boost::bind(&freq_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); 744 745 d_main_gui = NULL; 746 747diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc 748index d16de932c..1602d1896 100644 749--- a/gr-qtgui/lib/histogram_sink_f_impl.cc 750+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc 751@@ -81,8 +81,9 @@ histogram_sink_f_impl::histogram_sink_f_impl(int size, 752 753 // setup PDU handling input port 754 message_port_register_in(pmt::mp("in")); 755- set_msg_handler(pmt::mp("in"), 756- boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1)); 757+ set_msg_handler( 758+ pmt::mp("in"), 759+ boost::bind(&histogram_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); 760 761 // +1 for the PDU buffer 762 for (int i = 0; i < d_nconnections + 1; i++) { 763diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc 764index d3feb9d16..73136e789 100644 765--- a/gr-qtgui/lib/sink_c_impl.cc 766+++ b/gr-qtgui/lib/sink_c_impl.cc 767@@ -96,7 +96,9 @@ sink_c_impl::sink_c_impl(int fftsize, 768 // double-clicked 769 message_port_register_out(d_port); 770 message_port_register_in(d_port); 771- set_msg_handler(d_port, boost::bind(&sink_c_impl::handle_set_freq, this, _1)); 772+ set_msg_handler( 773+ d_port, 774+ boost::bind(&sink_c_impl::handle_set_freq, this, boost::placeholders::_1)); 775 776 d_main_gui = NULL; 777 778diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc 779index 418b630b7..d31023a51 100644 780--- a/gr-qtgui/lib/sink_f_impl.cc 781+++ b/gr-qtgui/lib/sink_f_impl.cc 782@@ -95,7 +95,9 @@ sink_f_impl::sink_f_impl(int fftsize, 783 // double-clicked 784 message_port_register_out(d_port); 785 message_port_register_in(d_port); 786- set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1)); 787+ set_msg_handler( 788+ d_port, 789+ boost::bind(&sink_f_impl::handle_set_freq, this, boost::placeholders::_1)); 790 791 d_main_gui = NULL; 792 793diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc 794index 045c216b0..3aa503ccf 100644 795--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc 796+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc 797@@ -84,7 +84,9 @@ time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate, 798 // setup PDU handling input port 799 message_port_register_in(pmt::mp("in")); 800 set_msg_handler(pmt::mp("in"), 801- boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1)); 802+ boost::bind(&time_raster_sink_b_impl::handle_pdus, 803+ this, 804+ boost::placeholders::_1)); 805 806 d_scale = 1.0f; 807 808diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc 809index d186f319d..b3516e5be 100644 810--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc 811+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc 812@@ -84,7 +84,9 @@ time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate, 813 // setup PDU handling input port 814 message_port_register_in(pmt::mp("in")); 815 set_msg_handler(pmt::mp("in"), 816- boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1)); 817+ boost::bind(&time_raster_sink_f_impl::handle_pdus, 818+ this, 819+ boost::placeholders::_1)); 820 821 d_icols = static_cast<int>(ceil(d_cols)); 822 d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment()); 823diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc 824index b73a1c1ad..83fbda298 100644 825--- a/gr-qtgui/lib/time_sink_c_impl.cc 826+++ b/gr-qtgui/lib/time_sink_c_impl.cc 827@@ -80,7 +80,9 @@ time_sink_c_impl::time_sink_c_impl(int size, 828 829 // setup PDU handling input port 830 message_port_register_in(pmt::mp("in")); 831- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1)); 832+ set_msg_handler( 833+ pmt::mp("in"), 834+ boost::bind(&time_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); 835 836 // +2 for the PDU message buffers 837 for (unsigned int n = 0; n < d_nconnections + 2; n++) { 838diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc 839index df13998d7..dd5ed12c8 100644 840--- a/gr-qtgui/lib/time_sink_f_impl.cc 841+++ b/gr-qtgui/lib/time_sink_f_impl.cc 842@@ -80,7 +80,9 @@ time_sink_f_impl::time_sink_f_impl(int size, 843 844 // setup PDU handling input port 845 message_port_register_in(pmt::mp("in")); 846- set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1)); 847+ set_msg_handler( 848+ pmt::mp("in"), 849+ boost::bind(&time_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); 850 851 // +1 for the PDU buffer 852 for (unsigned int n = 0; n < d_nconnections + 1; n++) { 853diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc 854index fcf2ed98b..da38d32ba 100644 855--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc 856+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc 857@@ -118,19 +118,24 @@ waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize, 858 // setup bw input port 859 message_port_register_in(d_port_bw); 860 set_msg_handler(d_port_bw, 861- boost::bind(&waterfall_sink_c_impl::handle_set_bw, this, _1)); 862+ boost::bind(&waterfall_sink_c_impl::handle_set_bw, 863+ this, 864+ boost::placeholders::_1)); 865 866 // setup output message port to post frequency when display is 867 // double-clicked 868 message_port_register_out(d_port); 869 message_port_register_in(d_port); 870 set_msg_handler(d_port, 871- boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1)); 872+ boost::bind(&waterfall_sink_c_impl::handle_set_freq, 873+ this, 874+ boost::placeholders::_1)); 875 876 // setup PDU handling input port 877 message_port_register_in(pmt::mp("in")); 878- set_msg_handler(pmt::mp("in"), 879- boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1)); 880+ set_msg_handler( 881+ pmt::mp("in"), 882+ boost::bind(&waterfall_sink_c_impl::handle_pdus, this, boost::placeholders::_1)); 883 } 884 885 waterfall_sink_c_impl::~waterfall_sink_c_impl() 886diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc 887index aa1037a47..d4231a564 100644 888--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc 889+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc 890@@ -116,19 +116,24 @@ waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize, 891 // setup bw input port 892 message_port_register_in(d_port_bw); 893 set_msg_handler(d_port_bw, 894- boost::bind(&waterfall_sink_f_impl::handle_set_bw, this, _1)); 895+ boost::bind(&waterfall_sink_f_impl::handle_set_bw, 896+ this, 897+ boost::placeholders::_1)); 898 899 // setup output message port to post frequency when display is 900 // double-clicked 901 message_port_register_out(d_port); 902 message_port_register_in(d_port); 903 set_msg_handler(d_port, 904- boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1)); 905+ boost::bind(&waterfall_sink_f_impl::handle_set_freq, 906+ this, 907+ boost::placeholders::_1)); 908 909 // setup PDU handling input port 910 message_port_register_in(pmt::mp("in")); 911- set_msg_handler(pmt::mp("in"), 912- boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1)); 913+ set_msg_handler( 914+ pmt::mp("in"), 915+ boost::bind(&waterfall_sink_f_impl::handle_pdus, this, boost::placeholders::_1)); 916 } 917 918 waterfall_sink_f_impl::~waterfall_sink_f_impl() 919diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc 920index 4f030159f..697d633c1 100644 921--- a/gr-uhd/lib/usrp_block_impl.cc 922+++ b/gr-uhd/lib/usrp_block_impl.cc 923@@ -137,12 +137,18 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr, 924 // Set up message ports: 925 message_port_register_in(pmt::mp("command")); 926 set_msg_handler(pmt::mp("command"), 927- boost::bind(&usrp_block_impl::msg_handler_command, this, _1)); 928+ boost::bind(&usrp_block_impl::msg_handler_command, 929+ this, 930+ boost::placeholders::_1)); 931 932 // cuz we lazy: 933-#define REGISTER_CMD_HANDLER(key, _handler) \ 934- register_msg_cmd_handler(key, \ 935- boost::bind(&usrp_block_impl::_handler, this, _1, _2, _3)) 936+#define REGISTER_CMD_HANDLER(key, _handler) \ 937+ register_msg_cmd_handler(key, \ 938+ boost::bind(&usrp_block_impl::_handler, \ 939+ this, \ 940+ boost::placeholders::_1, \ 941+ boost::placeholders::_2, \ 942+ boost::placeholders::_3)) 943 // Register default command handlers: 944 REGISTER_CMD_HANDLER(cmd_freq_key(), _cmd_handler_freq); 945 REGISTER_CMD_HANDLER(cmd_gain_key(), _cmd_handler_gain); 946@@ -257,11 +263,12 @@ bool usrp_block_impl::_check_mboard_sensors_locked() 947 } else if (_dev->get_clock_source(mboard_index) == "mimo") { 948 sensor_name = "mimo_locked"; 949 } 950- if (not _wait_for_locked_sensor( 951- get_mboard_sensor_names(mboard_index), 952- sensor_name, 953- boost::bind( 954- &usrp_block_impl::get_mboard_sensor, this, _1, mboard_index))) { 955+ if (not _wait_for_locked_sensor(get_mboard_sensor_names(mboard_index), 956+ sensor_name, 957+ boost::bind(&usrp_block_impl::get_mboard_sensor, 958+ this, 959+ boost::placeholders::_1, 960+ mboard_index))) { 961 GR_LOG_WARN( 962 d_logger, 963 boost::format( 964diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc 965index a2ff0821b..5e6bd4328 100644 966--- a/gr-uhd/lib/usrp_source_impl.cc 967+++ b/gr-uhd/lib/usrp_source_impl.cc 968@@ -57,8 +57,9 @@ usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t& device_addr, 969 970 _samp_rate = this->get_samp_rate(); 971 _samps_per_packet = 1; 972- register_msg_cmd_handler(cmd_tag_key(), 973- boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1)); 974+ register_msg_cmd_handler( 975+ cmd_tag_key(), 976+ boost::bind(&usrp_source_impl::_cmd_handler_tag, this, boost::placeholders::_1)); 977 } 978 979 usrp_source_impl::~usrp_source_impl() {} 980diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc 981index b5da7421e..957cfa411 100644 982--- a/gr-zeromq/lib/pub_msg_sink_impl.cc 983+++ b/gr-zeromq/lib/pub_msg_sink_impl.cc 984@@ -62,7 +62,9 @@ pub_msg_sink_impl::pub_msg_sink_impl(char* address, int timeout, bool bind) 985 } 986 987 message_port_register_in(pmt::mp("in")); 988- set_msg_handler(pmt::mp("in"), boost::bind(&pub_msg_sink_impl::handler, this, _1)); 989+ set_msg_handler( 990+ pmt::mp("in"), 991+ boost::bind(&pub_msg_sink_impl::handler, this, boost::placeholders::_1)); 992 } 993 994 pub_msg_sink_impl::~pub_msg_sink_impl() 995diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc 996index 4140781ab..7d07d3a30 100644 997--- a/gr-zeromq/lib/push_msg_sink_impl.cc 998+++ b/gr-zeromq/lib/push_msg_sink_impl.cc 999@@ -62,7 +62,9 @@ push_msg_sink_impl::push_msg_sink_impl(char* address, int timeout, bool bind) 1000 } 1001 1002 message_port_register_in(pmt::mp("in")); 1003- set_msg_handler(pmt::mp("in"), boost::bind(&push_msg_sink_impl::handler, this, _1)); 1004+ set_msg_handler( 1005+ pmt::mp("in"), 1006+ boost::bind(&push_msg_sink_impl::handler, this, boost::placeholders::_1)); 1007 } 1008 1009 push_msg_sink_impl::~push_msg_sink_impl() 1010-- 10112.26.2 1012 1013