diff options
Diffstat (limited to 'gnuradio-core/src/lib')
6 files changed, 16 insertions, 16 deletions
diff --git a/gnuradio-core/src/lib/general/gr_annotator_1to1.cc b/gnuradio-core/src/lib/general/gr_annotator_1to1.cc index d2d2599d3..1a6cadbcf 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_1to1.cc +++ b/gnuradio-core/src/lib/general/gr_annotator_1to1.cc @@ -31,19 +31,19 @@ #include <iomanip> gr_annotator_1to1_sptr -gr_make_annotator_1to1 (uint64_t when, size_t sizeof_stream_item, +gr_make_annotator_1to1 (int when, size_t sizeof_stream_item, float rel_rate) { return gnuradio::get_initial_sptr (new gr_annotator_1to1 (when, sizeof_stream_item, rel_rate)); } -gr_annotator_1to1::gr_annotator_1to1 (uint64_t when, size_t sizeof_stream_item, +gr_annotator_1to1::gr_annotator_1to1 (int when, size_t sizeof_stream_item, float rel_rate) : gr_block ("annotator_1to1", gr_make_io_signature (1, -1, sizeof_stream_item), gr_make_io_signature (1, -1, sizeof_stream_item)), - d_itemsize(sizeof_stream_item), d_rel_rate(rel_rate), d_when(when) + d_itemsize(sizeof_stream_item), d_rel_rate(rel_rate), d_when((uint64_t)when) { set_tag_propagation_policy(TPP_ONE_TO_ONE); diff --git a/gnuradio-core/src/lib/general/gr_annotator_1to1.h b/gnuradio-core/src/lib/general/gr_annotator_1to1.h index ef14f9b52..e9167bf39 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_1to1.h +++ b/gnuradio-core/src/lib/general/gr_annotator_1to1.h @@ -30,7 +30,7 @@ typedef boost::shared_ptr<gr_annotator_1to1> gr_annotator_1to1_sptr; // public constructor gr_annotator_1to1_sptr -gr_make_annotator_1to1 (uint64_t when, size_t sizeof_stream_item, +gr_make_annotator_1to1 (int when, size_t sizeof_stream_item, float rel_rate=1.0); /*! @@ -68,7 +68,7 @@ class gr_annotator_1to1 : public gr_block } protected: - gr_annotator_1to1 (uint64_t when, size_t sizeof_stream_item, + gr_annotator_1to1 (int when, size_t sizeof_stream_item, float rel_rate); private: @@ -79,7 +79,7 @@ protected: std::vector<pmt::pmt_t> d_stored_tags; friend gr_annotator_1to1_sptr - gr_make_annotator_1to1 (uint64_t when, size_t sizeof_stream_item, + gr_make_annotator_1to1 (int when, size_t sizeof_stream_item, float rel_rate); }; diff --git a/gnuradio-core/src/lib/general/gr_annotator_1to1.i b/gnuradio-core/src/lib/general/gr_annotator_1to1.i index d8f10b44f..99ab4788c 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_1to1.i +++ b/gnuradio-core/src/lib/general/gr_annotator_1to1.i @@ -22,7 +22,7 @@ GR_SWIG_BLOCK_MAGIC(gr,annotator_1to1); -gr_annotator_1to1_sptr gr_make_annotator_1to1 (uint64_t when, +gr_annotator_1to1_sptr gr_make_annotator_1to1 (int when, size_t sizeof_stream_item, float rel_rate); @@ -34,7 +34,7 @@ public: std::vector<pmt::pmt_t> data() const; private: - gr_annotator_1to1 (uint64_t when, size_t sizeof_stream_item, + gr_annotator_1to1 (int when, size_t sizeof_stream_item, float rel_rate); }; diff --git a/gnuradio-core/src/lib/general/gr_annotator_alltoall.cc b/gnuradio-core/src/lib/general/gr_annotator_alltoall.cc index 88419fe0d..e7bf5d007 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_alltoall.cc +++ b/gnuradio-core/src/lib/general/gr_annotator_alltoall.cc @@ -31,20 +31,20 @@ #include <iomanip> gr_annotator_alltoall_sptr -gr_make_annotator_alltoall (uint64_t when, size_t sizeof_stream_item, +gr_make_annotator_alltoall (int when, size_t sizeof_stream_item, float rel_rate) { return gnuradio::get_initial_sptr (new gr_annotator_alltoall (when, sizeof_stream_item, rel_rate)); } -gr_annotator_alltoall::gr_annotator_alltoall (uint64_t when, +gr_annotator_alltoall::gr_annotator_alltoall (int when, size_t sizeof_stream_item, float rel_rate) : gr_block ("annotator_alltoall", gr_make_io_signature (1, -1, sizeof_stream_item), gr_make_io_signature (1, -1, sizeof_stream_item)), - d_itemsize(sizeof_stream_item), d_rel_rate(rel_rate), d_when(when) + d_itemsize(sizeof_stream_item), d_rel_rate(rel_rate), d_when((uint64_t)when) { set_tag_propagation_policy(TPP_ALL_TO_ALL); diff --git a/gnuradio-core/src/lib/general/gr_annotator_alltoall.h b/gnuradio-core/src/lib/general/gr_annotator_alltoall.h index d6d2f1503..38cb53bd6 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_alltoall.h +++ b/gnuradio-core/src/lib/general/gr_annotator_alltoall.h @@ -30,7 +30,7 @@ typedef boost::shared_ptr<gr_annotator_alltoall> gr_annotator_alltoall_sptr; // public constructor gr_annotator_alltoall_sptr -gr_make_annotator_alltoall (uint64_t when, size_t sizeof_stream_item, +gr_make_annotator_alltoall (int when, size_t sizeof_stream_item, float rel_rate=1.0); /*! @@ -68,7 +68,7 @@ class gr_annotator_alltoall : public gr_block } protected: - gr_annotator_alltoall (uint64_t when, size_t sizeof_stream_item, + gr_annotator_alltoall (int when, size_t sizeof_stream_item, float rel_rate); private: @@ -79,7 +79,7 @@ protected: std::vector<pmt::pmt_t> d_stored_tags; friend gr_annotator_alltoall_sptr - gr_make_annotator_alltoall (uint64_t when, size_t sizeof_stream_item, + gr_make_annotator_alltoall (int when, size_t sizeof_stream_item, float rel_rate); }; diff --git a/gnuradio-core/src/lib/general/gr_annotator_alltoall.i b/gnuradio-core/src/lib/general/gr_annotator_alltoall.i index c6abb1b5e..7812e80c5 100644 --- a/gnuradio-core/src/lib/general/gr_annotator_alltoall.i +++ b/gnuradio-core/src/lib/general/gr_annotator_alltoall.i @@ -22,7 +22,7 @@ GR_SWIG_BLOCK_MAGIC(gr,annotator_alltoall); -gr_annotator_alltoall_sptr gr_make_annotator_alltoall (uint64_t when, +gr_annotator_alltoall_sptr gr_make_annotator_alltoall (int when, size_t sizeof_stream_item, float rel_rate); @@ -34,6 +34,6 @@ public: std::vector<pmt::pmt_t> data() const; private: - gr_annotator_alltoall (uint64_t when, size_t sizeof_stream_item, float rel_rate); + gr_annotator_alltoall (int when, size_t sizeof_stream_item, float rel_rate); }; |