diff options
| author | Josh Blum | 2012-10-04 20:20:26 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-10-04 20:20:26 -0700 |
| commit | c74b464015541a5b3d8efd3551231431562f32cb (patch) | |
| tree | 445dfcc267ae8910243ef1e06f740e43c8d6b161 | |
| parent | 12170824b70fa127fe8ed0ac1b81c627c06bd851 (diff) | |
| download | sandhi-c74b464015541a5b3d8efd3551231431562f32cb.tar.gz sandhi-c74b464015541a5b3d8efd3551231431562f32cb.tar.bz2 sandhi-c74b464015541a5b3d8efd3551231431562f32cb.zip | |
swig issues worked out, Work can be work again
| -rw-r--r-- | include/gnuradio/block.hpp | 2 | ||||
| -rw-r--r-- | include/gnuradio/gr_block.h | 2 | ||||
| -rw-r--r-- | lib/gr_block.cpp | 2 | ||||
| -rw-r--r-- | lib/gras_impl/block_actor.hpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/gnuradio/block.hpp b/include/gnuradio/block.hpp index d06c49c..5796dc2 100644 --- a/include/gnuradio/block.hpp +++ b/include/gnuradio/block.hpp @@ -235,7 +235,7 @@ struct GRAS_API Block : Element typedef std::vector<WorkBuffer<void *> > OutputItems; //! The official call into the work routine (overload please) - virtual int Work( + virtual int work( const InputItems &input_items, const OutputItems &output_items ) = 0; diff --git a/include/gnuradio/gr_block.h b/include/gnuradio/gr_block.h index 317c207..e60d231 100644 --- a/include/gnuradio/gr_block.h +++ b/include/gnuradio/gr_block.h @@ -51,7 +51,7 @@ struct GRAS_API gr_block : gnuradio::Block template <typename T> void set_msg_handler(T msg_handler){/*LOL*/} //! implements work -> calls general work - int Work( + int work( const InputItems &input_items, const OutputItems &output_items ); diff --git a/lib/gr_block.cpp b/lib/gr_block.cpp index 4b3335b..27c0eb4 100644 --- a/lib/gr_block.cpp +++ b/lib/gr_block.cpp @@ -34,7 +34,7 @@ gr_block::gr_block( this->set_output_signature(output_signature); } -int gr_block::Work( +int gr_block::work( const InputItems &input_items, const OutputItems &output_items ){ diff --git a/lib/gras_impl/block_actor.hpp b/lib/gras_impl/block_actor.hpp index e3e8463..bbe6d6c 100644 --- a/lib/gras_impl/block_actor.hpp +++ b/lib/gras_impl/block_actor.hpp @@ -170,7 +170,7 @@ struct BlockActor : Apology::Worker int work_ret; inline void task_work(void) { - this->work_ret = block_ptr->Work(this->input_items, this->output_items); + this->work_ret = block_ptr->work(this->input_items, this->output_items); } //is the fg running? |