diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-07-20 03:47:14 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-07-20 03:47:14 +0000 |
| commit | 6f50256f958ac60d5fc9212b24d86777c1b2ec0d (patch) | |
| tree | afdde009cf81d93bcb84027937c62ef71194d9fd /mblock/src/lib/mb_mblock_impl.h | |
| parent | aff2d8ad842994b1f58e0dc56b7d2fd6229377a9 (diff) | |
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_mblock_impl.h')
| -rw-r--r-- | mblock/src/lib/mb_mblock_impl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mblock/src/lib/mb_mblock_impl.h b/mblock/src/lib/mb_mblock_impl.h index 9914579124..fa982cbabc 100644 --- a/mblock/src/lib/mb_mblock_impl.h +++ b/mblock/src/lib/mb_mblock_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2007,2008 Free Software Foundation, Inc. + * Copyright 2006,2007,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -87,7 +87,7 @@ public: void define_component(const std::string &component_name, const std::string &class_name, - pmt_t user_arg); + gruel::pmt_t user_arg); /*! * \brief connect endpoint_1 to endpoint_2 @@ -148,7 +148,7 @@ public: walk_tree(mb_visitor *visitor); mb_msg_accepter_sptr - make_accepter(pmt_t port_name); + make_accepter(gruel::pmt_t port_name); mb_msg_queue & msgq() { return d_msgq; } @@ -196,9 +196,9 @@ public: * Our implementation methods */ private: - //bool port_is_defined(pmt_t name); + //bool port_is_defined(gruel::pmt_t name); bool port_is_defined(const std::string &name); - //bool comp_is_defined(pmt_t name); + //bool comp_is_defined(gruel::pmt_t name); bool comp_is_defined(const std::string &name); mb_endpoint |