diff options
| author | jcorgan | 2009-07-20 03:47:14 +0000 |
|---|---|---|
| committer | jcorgan | 2009-07-20 03:47:14 +0000 |
| commit | 6f50256f958ac60d5fc9212b24d86777c1b2ec0d (patch) | |
| tree | afdde009cf81d93bcb84027937c62ef71194d9fd /mblock/src/lib/mb_runtime_nop.cc | |
| parent | aff2d8ad842994b1f58e0dc56b7d2fd6229377a9 (diff) | |
| download | gnuradio-6f50256f958ac60d5fc9212b24d86777c1b2ec0d.tar.gz gnuradio-6f50256f958ac60d5fc9212b24d86777c1b2ec0d.tar.bz2 gnuradio-6f50256f958ac60d5fc9212b24d86777c1b2ec0d.zip | |
Merged r11452:11459 from jcorgan/pmt-gruel into trunk. Trunk passes distcheck.
* Merges libpmt into libgruel
* Modifies libmblock to use libgruel
gruel::pmt_t will be the fundamental msg content for the new message passing
implemention for 3.3.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11460 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'mblock/src/lib/mb_runtime_nop.cc')
| -rw-r--r-- | mblock/src/lib/mb_runtime_nop.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mblock/src/lib/mb_runtime_nop.cc b/mblock/src/lib/mb_runtime_nop.cc index 603d5addb..3ea6d093b 100644 --- a/mblock/src/lib/mb_runtime_nop.cc +++ b/mblock/src/lib/mb_runtime_nop.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007,2008 Free Software Foundation, Inc. + * Copyright 2007,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -48,7 +48,7 @@ mb_runtime_nop::~mb_runtime_nop() bool mb_runtime_nop::run(const std::string &instance_name, const std::string &class_name, - pmt_t user_arg, pmt_t *result) + gruel::pmt_t user_arg, gruel::pmt_t *result) { class initial_visitor : public mb_visitor { @@ -63,7 +63,7 @@ mb_runtime_nop::run(const std::string &instance_name, initial_visitor visitor; if (result) - *result = PMT_T; + *result = gruel::PMT_T; d_top = create_component(instance_name, class_name, user_arg); d_top->walk_tree(&visitor); @@ -74,7 +74,7 @@ mb_runtime_nop::run(const std::string &instance_name, mb_mblock_sptr mb_runtime_nop::create_component(const std::string &instance_name, const std::string &class_name, - pmt_t user_arg) + gruel::pmt_t user_arg) { mb_mblock_maker_t maker; if (!mb_class_registry::lookup_maker(class_name, &maker)) |