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_msg_accepter_msgq.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_msg_accepter_msgq.cc')
| -rw-r--r-- | mblock/src/lib/mb_msg_accepter_msgq.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mblock/src/lib/mb_msg_accepter_msgq.cc b/mblock/src/lib/mb_msg_accepter_msgq.cc index fb97914e5..e13ec5aa4 100644 --- a/mblock/src/lib/mb_msg_accepter_msgq.cc +++ b/mblock/src/lib/mb_msg_accepter_msgq.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 * @@ -25,7 +25,7 @@ #include <mb_msg_accepter_msgq.h> #include <mblock/message.h> -pmt_t s_sys_port = pmt_intern("%sys-port"); +gruel::pmt_t s_sys_port = gruel::pmt_intern("%sys-port"); mb_msg_accepter_msgq::mb_msg_accepter_msgq(mb_msg_queue *msgq) : d_msgq(msgq) @@ -37,8 +37,8 @@ mb_msg_accepter_msgq::~mb_msg_accepter_msgq() } void -mb_msg_accepter_msgq::operator()(pmt_t signal, pmt_t data, - pmt_t metadata, mb_pri_t priority) +mb_msg_accepter_msgq::operator()(gruel::pmt_t signal, gruel::pmt_t data, + gruel::pmt_t metadata, mb_pri_t priority) { mb_message_sptr msg = mb_make_message(signal, data, metadata, priority); msg->set_port_id(s_sys_port); |