Merged r11491:11494 from jcorgan/pmt into trunk.

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

diff --git a/mblock/src/lib/mb_msg_accepter_msgq.h b/mblock/src/lib/mb_msg_accepter_msgq.h
index f598c7304dfde3e9ad6561580d83037cfe6da792..f84bca596cc1ff4716beefeb2d552596121fc1d1 100644 (file)
--- a/mblock/src/lib/mb_msg_accepter_msgq.h
+++ b/mblock/src/lib/mb_msg_accepter_msgq.h
@@ -1,12 +1,12 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_MB_MSG_ACCEPTER_MSGQ_H
 #define INCLUDED_MB_MSG_ACCEPTER_MSGQ_H
 
-#include <mb_msg_accepter.h>
-#include <mb_msg_queue.h>
+#include <mblock/msg_accepter.h>
+#include <mblock/msg_queue.h>
 
 /*!
  * \brief Concrete class that accepts messages and inserts them into a message queue.
@@ -33,7 +33,7 @@ class mb_msg_accepter_msgq : public mb_msg_accepter {
 public:
   mb_msg_accepter_msgq(mb_msg_queue *msgq);
   ~mb_msg_accepter_msgq();
-  void operator()(pmt_t signal, pmt_t data, pmt_t metadata, mb_pri_t priority);
+  void operator()(pmt::pmt_t signal, pmt::pmt_t data, pmt::pmt_t metadata, mb_pri_t priority);
 };
 
 #endif /* INCLUDED_MB_MSG_ACCEPTER_MSGQ_H */