0002-boost_qualify_placeholders_with_their_full_namespace.patch 46 KB

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