diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-blocks/lib/annotator_1to1_impl.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-blocks/lib/annotator_1to1_impl.cc')
| -rw-r--r-- | gr-blocks/lib/annotator_1to1_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gr-blocks/lib/annotator_1to1_impl.cc b/gr-blocks/lib/annotator_1to1_impl.cc index e7f105fc02..04f9a2f458 100644 --- a/gr-blocks/lib/annotator_1to1_impl.cc +++ b/gr-blocks/lib/annotator_1to1_impl.cc @@ -25,7 +25,7 @@ #endif #include "annotator_1to1_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <iostream> #include <iomanip> @@ -41,9 +41,9 @@ namespace gr { } annotator_1to1_impl::annotator_1to1_impl(int when, size_t sizeof_stream_item) - : gr_sync_block("annotator_1to1", - gr_make_io_signature(1, -1, sizeof_stream_item), - gr_make_io_signature(1, -1, sizeof_stream_item)), + : sync_block("annotator_1to1", + io_signature::make(1, -1, sizeof_stream_item), + io_signature::make(1, -1, sizeof_stream_item)), d_itemsize(sizeof_stream_item), d_when((uint64_t)when) { set_tag_propagation_policy(TPP_ONE_TO_ONE); @@ -72,10 +72,10 @@ namespace gr { for(int i = 0; i < ninputs; i++) { abs_N = nitems_read(i); - std::vector<gr_tag_t> all_tags; + std::vector<tag_t> all_tags; get_tags_in_range(all_tags, i, abs_N, abs_N + noutput_items); - std::vector<gr_tag_t>::iterator itr; + std::vector<tag_t>::iterator itr; for(itr = all_tags.begin(); itr != all_tags.end(); itr++) { d_stored_tags.push_back(*itr); } |