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_simple.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_simple.cc')
| -rw-r--r-- | mblock/src/lib/mb_port_simple.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mblock/src/lib/mb_port_simple.cc b/mblock/src/lib/mb_port_simple.cc index 1b4b35cbf..3005932f1 100644 --- a/mblock/src/lib/mb_port_simple.cc +++ b/mblock/src/lib/mb_port_simple.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_port_simple::~mb_port_simple() } void -mb_port_simple::send(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority) +mb_port_simple::send(gruel::pmt_t signal, gruel::pmt_t data, gruel::pmt_t metadata, mb_pri_t priority) { if (port_type() == mb_port::RELAY) // Can't send directly to a RELAY port throw mbe_invalid_port_type(mblock(), mblock()->instance_name(), port_name()); |