diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
| commit | 792302fbdfa37cf680234353dbe973886c4b2898 (patch) | |
| tree | e999bcf6dbfe12cf19ae49b1762cd71d724aa8ae /gnuradio-runtime/lib/block.cc | |
| parent | a7adf4689b58d91bd88d0dc948b017e1d42bff01 (diff) | |
| parent | 9851f2377d099ffe72312375e7f761f66b664aa6 (diff) | |
Merge branch 'next' into runtime_pimpl
Catches up runtime_pimpl branch with changes on next since
the initial branch start.
Conflicts:
gnuradio-runtime/include/gnuradio/constants.h
gnuradio-runtime/include/gnuradio/tags.h
gnuradio-runtime/include/gr_block_detail.h
gnuradio-runtime/include/gr_buffer.h
gnuradio-runtime/lib/CMakeLists.txt
gnuradio-runtime/lib/gr_block.cc
gnuradio-runtime/lib/gr_block_detail.cc
gnuradio-runtime/lib/gr_block_executor.cc
gnuradio-runtime/lib/gr_buffer.cc
gnuradio-runtime/lib/gr_realtime.cc
gr-blocks/lib/interleaved_short_to_complex_impl.cc
Diffstat (limited to 'gnuradio-runtime/lib/block.cc')
| -rw-r--r-- | gnuradio-runtime/lib/block.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc index b38377e856..4246180d80 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc @@ -240,7 +240,7 @@ namespace gr { block::remove_item_tag(unsigned int which_input, const tag_t &tag) { - d_detail->remove_item_tag(which_input, tag); + d_detail->remove_item_tag(which_input, tag, unique_id()); } void @@ -248,7 +248,7 @@ namespace gr { unsigned int which_output, uint64_t start, uint64_t end) { - d_detail->get_tags_in_range(v, which_output, start, end); + d_detail->get_tags_in_range(v, which_output, start, end, unique_id()); } void @@ -257,7 +257,7 @@ namespace gr { uint64_t start, uint64_t end, const pmt::pmt_t &key) { - d_detail->get_tags_in_range(v, which_output, start, end, key); + d_detail->get_tags_in_range(v, which_output, start, end, key, unique_id()); } block::tag_propagation_policy_t |