Merged r11452:11459 from jcorgan/pmt-gruel into trunk. Trunk passes distcheck.

[debian/gnuradio] / mblock / src / lib / mb_msg_accepter_msgq.cc

diff --git a/mblock/src/lib/mb_msg_accepter_msgq.cc b/mblock/src/lib/mb_msg_accepter_msgq.cc
index 8220dbfee43456a418f46d537c37114136b57167..e13ec5aa43f2495e7abdde63689daaf9ee5641c4 100644 (file)
--- 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 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,9 +23,9 @@
 #include <config.h>
 #endif
 #include <mb_msg_accepter_msgq.h>
-#include <mb_message.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);