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_port.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_port.cc')
| -rw-r--r-- | mblock/src/lib/mb_port.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mblock/src/lib/mb_port.cc b/mblock/src/lib/mb_port.cc index a13f49f2c..abf909fd3 100644 --- a/mblock/src/lib/mb_port.cc +++ b/mblock/src/lib/mb_port.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2008 Free Software Foundation, Inc. + * Copyright 2006,2008,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -31,11 +31,11 @@ mb_port::mb_port(mb_mblock *mblock, const std::string &protocol_class_name, bool conjugated, mb_port::port_type_t port_type) - : d_port_name(port_name), d_port_symbol(pmt_intern(port_name)), + : d_port_name(port_name), d_port_symbol(gruel::pmt_intern(port_name)), d_conjugated(conjugated), d_port_type(port_type), d_mblock(mblock) { - pmt_t pc = mb_protocol_class_lookup(pmt_intern(protocol_class_name)); + gruel::pmt_t pc = mb_protocol_class_lookup(gruel::pmt_intern(protocol_class_name)); if (pmt_is_null(pc)){ throw std::runtime_error("mb_port: unknown protocol class '" + protocol_class_name + "'"); @@ -48,7 +48,7 @@ mb_port::~mb_port() // nop } -pmt_t +gruel::pmt_t mb_port::incoming_message_set() const { if (!conjugated()) @@ -57,7 +57,7 @@ mb_port::incoming_message_set() const return mb_protocol_class_outgoing(protocol_class()); } -pmt_t +gruel::pmt_t mb_port::outgoing_message_set() const { if (!conjugated()) |