From 6f50256f958ac60d5fc9212b24d86777c1b2ec0d Mon Sep 17 00:00:00 2001 From: jcorgan Date: Mon, 20 Jul 2009 03:47:14 +0000 Subject: 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 --- mblock/src/lib/mb_port_simple.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mblock/src/lib/mb_port_simple.h') diff --git a/mblock/src/lib/mb_port_simple.h b/mblock/src/lib/mb_port_simple.h index 87b7654b0..a2136ed0a 100644 --- a/mblock/src/lib/mb_port_simple.h +++ b/mblock/src/lib/mb_port_simple.h @@ -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 * @@ -56,9 +56,9 @@ public: * \param priority the urgency at which the message is sent */ void - send(pmt_t signal, - pmt_t data = PMT_NIL, - pmt_t metadata = PMT_NIL, + send(gruel::pmt_t signal, + gruel::pmt_t data = gruel::PMT_NIL, + gruel::pmt_t metadata = gruel::PMT_NIL, mb_pri_t priority = MB_PRI_DEFAULT); /* -- cgit