diff options
| author | Marcus Müller <marcus.mueller@ettus.com> | 2018-03-30 13:17:10 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-03-30 20:46:04 +0200 |
| commit | 9a6bf484394f5954483477856f6a6712331b9ee6 (patch) | |
| tree | 91fd88420a8b373adb5ea2e76d002048cf78fa99 /gr-digital/lib/header_payload_demux_impl.cc | |
| parent | 50e0156324bec28d4e07b9598798b6267fb39155 (diff) | |
blocks: avoid potential static initialization order fiasco
Diffstat (limited to 'gr-digital/lib/header_payload_demux_impl.cc')
| -rw-r--r-- | gr-digital/lib/header_payload_demux_impl.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc index 646902d506..c6ec53ba35 100644 --- a/gr-digital/lib/header_payload_demux_impl.cc +++ b/gr-digital/lib/header_payload_demux_impl.cc @@ -31,7 +31,11 @@ namespace gr { namespace digital { - const pmt::pmt_t header_payload_demux_impl::s_msg_port_id = pmt::mp("header_data"); + const pmt::pmt_t header_payload_demux_impl::msg_port_id() + { + static const pmt::pmt_t msg_port_id = pmt::mp("header_data"); + return msg_port_id; + } //! Returns a PMT time tuple (uint seconds, double fraction) as the sum of // another PMT time tuple and a time diff in seconds. @@ -149,8 +153,8 @@ namespace gr { ); } set_tag_propagation_policy(TPP_DONT); - message_port_register_in(s_msg_port_id); - set_msg_handler(s_msg_port_id, boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1)); + message_port_register_in(msg_port_id()); + set_msg_handler(msg_port_id(), boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1)); for (size_t i = 0; i < special_tags.size(); i++) { d_special_tags.push_back(pmt::string_to_symbol(special_tags[i])); d_special_tags_last_value.push_back(pmt::PMT_NIL); |