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

1 files changed, 8 insertions, 8 deletions

diff --git a/mblock/src/lib/mb_runtime_base.h b/mblock/src/lib/mb_runtime_base.h
index 98b5f3e0a..d5ec29c21 100644
--- a/mblock/src/lib/mb_runtime_base.h
+++ b/mblock/src/lib/mb_runtime_base.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2007 Free Software Foundation, Inc.
+ * Copyright 2007,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -50,24 +50,24 @@ public:
    */
   inline void unlock() { d_brl.unlock(); }
 
-  virtual void request_shutdown(pmt_t result);
+  virtual void request_shutdown(gruel::pmt_t result);
 
   virtual mb_mblock_sptr
   create_component(const std::string &instance_name,
 		   const std::string &class_name,
-		   pmt_t user_arg) = 0;
+		   gruel::pmt_t user_arg) = 0;
 
-  virtual pmt_t
-  schedule_one_shot_timeout(const mb_time &abs_time, pmt_t user_data,
+  virtual gruel::pmt_t
+  schedule_one_shot_timeout(const mb_time &abs_time, gruel::pmt_t user_data,
 			    mb_msg_accepter_sptr accepter);
 
-  virtual pmt_t
+  virtual gruel::pmt_t
   schedule_periodic_timeout(const mb_time &first_abs_time,
 			    const mb_time &delta_time,
-			    pmt_t user_data,
+			    gruel::pmt_t user_data,
 			    mb_msg_accepter_sptr accepter);
   virtual void
-  cancel_timeout(pmt_t handle);
+  cancel_timeout(gruel::pmt_t handle);
 
   mb_msg_accepter_sptr
   accepter() { return d_accepter; }