diff options
| author | Josh Blum | 2012-08-19 14:27:11 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-08-26 16:03:51 -0700 |
| commit | fa25d15ed1a7b85869229055ef32166ef1d8bef2 (patch) | |
| tree | 0f39ab553dce30e9c8c11ab20f820d5753d5bf47 /lib/block.cpp | |
| parent | 87be8242fd5855a8e8f6a76fddf40275b711c784 (diff) | |
| download | sandhi-fa25d15ed1a7b85869229055ef32166ef1d8bef2.tar.gz sandhi-fa25d15ed1a7b85869229055ef32166ef1d8bef2.tar.bz2 sandhi-fa25d15ed1a7b85869229055ef32166ef1d8bef2.zip | |
runtime: work on unit tests
Diffstat (limited to 'lib/block.cpp')
| -rw-r--r-- | lib/block.cpp | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/lib/block.cpp b/lib/block.cpp index 2d5b4af..1bd1217 100644 --- a/lib/block.cpp +++ b/lib/block.cpp @@ -16,23 +16,18 @@ #include "element_impl.hpp" #include <gnuradio/block.hpp> -#include <boost/detail/atomic_count.hpp> #include <boost/bind.hpp> using namespace gnuradio; -static boost::detail::atomic_count unique_id_pool(0); - Block::Block(void) { //NOP } -Block::Block(const std::string &name) +Block::Block(const std::string &name): + Element(name) { - this->reset(new ElementImpl()); - (*this)->name = name; - (*this)->unique_id = ++unique_id_pool; this->set_history(0); this->set_output_multiple(1); this->set_fixed_rate(true); @@ -47,17 +42,6 @@ Block::Block(const std::string &name) } - -long Block::unique_id(void) const -{ - return (*this)->unique_id; -} - -std::string Block::name(void) const -{ - return (*this)->name; -} - template <typename V, typename T> void vector_set(V &v, const T &t, const size_t index) { @@ -78,28 +62,6 @@ typename V::value_type vector_get(const V &v, const size_t index) return v[index]; } -size_t Block::input_size(const size_t which_input) const -{ - return vector_get((*this)->input_items_sizes, which_input); -} - -size_t Block::output_size(const size_t which_output) const -{ - return vector_get((*this)->output_items_sizes, which_output); -} - -void Block::set_input_size(const size_t size, const size_t which_input) -{ - vector_set((*this)->input_items_sizes, size, which_input); - (*this)->input_signature = gr_make_io_signaturev(-1, -1, (*this)->input_items_sizes); -} - -void Block::set_output_size(const size_t size, const size_t which_output) -{ - vector_set((*this)->output_items_sizes, size, which_output); - (*this)->output_signature = gr_make_io_signaturev(-1, -1, (*this)->output_items_sizes); -} - size_t Block::history(const size_t which_input) const { return vector_get((*this)->input_history_items, which_input); |