diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-07-26 20:01:02 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-07-26 20:01:02 +0000 |
| commit | 2bf2a8f2d2a4477818bfa91cae64fb663fdf88c3 (patch) | |
| tree | d646b7851ed0ea3015c3480609d03d5589ebd60d /mblock/src/lib/mb_timer_queue.h | |
| parent | 970d850297cf945943528557127db2cd327c3f3c (diff) | |
Merged r11491:11494 from jcorgan/pmt into trunk.
Moves pmt types functions into pmt:: from gruel::
Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11495 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'mblock/src/lib/mb_timer_queue.h')
| -rw-r--r-- | mblock/src/lib/mb_timer_queue.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mblock/src/lib/mb_timer_queue.h b/mblock/src/lib/mb_timer_queue.h index 8dcf533836..7a1ad6fa30 100644 --- a/mblock/src/lib/mb_timer_queue.h +++ b/mblock/src/lib/mb_timer_queue.h @@ -33,19 +33,19 @@ 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 - gruel::pmt_t d_user_data; // data from %timeout msg - gruel::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, - gruel::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, - gruel::pmt_t user_data, mb_msg_accepter_sptr accepter); + pmt::pmt_t user_data, mb_msg_accepter_sptr accepter); - gruel::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(gruel::pmt_t handle); + void cancel(pmt::pmt_t handle); }; #endif /* INCLUDED_MB_TIMER_QUEUE_H */ |