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.h | |
parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) |
Merged in next_docs branch.
Diffstat (limited to 'gr-blocks/lib/annotator_1to1_impl.h')
-rw-r--r-- | gr-blocks/lib/annotator_1to1_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-blocks/lib/annotator_1to1_impl.h b/gr-blocks/lib/annotator_1to1_impl.h index 3306602e2c..2da73c8a66 100644 --- a/gr-blocks/lib/annotator_1to1_impl.h +++ b/gr-blocks/lib/annotator_1to1_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_ANNOTATOR_1TO1_IMPL_H #define INCLUDED_GR_ANNOTATOR_1TO1_IMPL_H -#include <blocks/annotator_1to1.h> +#include <gnuradio/blocks/annotator_1to1.h> namespace gr { namespace blocks { @@ -34,13 +34,13 @@ namespace gr { size_t d_itemsize; uint64_t d_when; uint64_t d_tag_counter; - std::vector<gr_tag_t> d_stored_tags; + std::vector<tag_t> d_stored_tags; public: annotator_1to1_impl(int when, size_t sizeof_stream_item); ~annotator_1to1_impl(); - std::vector<gr_tag_t> data() const + std::vector<tag_t> data() const { return d_stored_tags; } |