Merged r11491:11494 from jcorgan/pmt into trunk.

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

diff --git a/mblock/src/lib/mb_timer_queue.h b/mblock/src/lib/mb_timer_queue.h
index 208e37d51b2c2fe8500ce68263ff49806441e93f..7a1ad6fa30b21cd316a634cde5e937121a324619 100644 (file)
--- a/mblock/src/lib/mb_timer_queue.h
+++ b/mblock/src/lib/mb_timer_queue.h
@@ -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
  * 
@@ -22,30 +22,30 @@
 #ifndef INCLUDED_MB_TIMER_QUEUE_H
 #define INCLUDED_MB_TIMER_QUEUE_H
 
-#include <mb_time.h>
+#include <mblock/time.h>
 #include <vector>
 #include <queue>
-#include <pmt.h>
-#include <mb_msg_accepter.h>
+#include <gruel/pmt.h>
+#include <mblock/msg_accepter.h>
 
 class mb_timeout {
 public:
   mb_time              d_when;         // absolute time to fire timeout
   mb_time              d_delta;        // if periodic, delta_t to next timeout
   bool                 d_is_periodic;  // true iff this is a periodic timeout
-  pmt_t                        d_user_data;    // data from %timeout msg
-  pmt_t                        d_handle;       // handle for cancellation
+  pmt::pmt_t           d_user_data;    // data from %timeout msg
+  pmt::pmt_t           d_handle;       // handle for cancellation
   mb_msg_accepter_sptr d_accepter;     // where to send the message
 
   // one-shot constructor
   mb_timeout(const mb_time &abs_time,
-            pmt_t user_data, mb_msg_accepter_sptr accepter);
+            pmt::pmt_t user_data, mb_msg_accepter_sptr accepter);
 
   // periodic constructor
   mb_timeout(const mb_time &first_abs_time, const mb_time &delta_time,
-            pmt_t user_data, mb_msg_accepter_sptr accepter);
+            pmt::pmt_t user_data, mb_msg_accepter_sptr accepter);
 
-  pmt_t handle() const { return d_handle; }
+  pmt::pmt_t handle() const { return d_handle; }
 };
 
 typedef boost::shared_ptr<mb_timeout> mb_timeout_sptr;
@@ -67,7 +67,7 @@ class mb_timer_queue : public std::priority_queue<mb_timeout_sptr,
                                                  timeout_later>
 {
 public:
-  void cancel(pmt_t handle);
+  void cancel(pmt::pmt_t handle);
 };
 
 #endif /* INCLUDED_MB_TIMER_QUEUE_H */