diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gnuradio-runtime/lib/messages | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gnuradio-runtime/lib/messages')
| -rw-r--r-- | gnuradio-runtime/lib/messages/msg_accepter.cc | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/messages/msg_accepter_msgq.cc | 6 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/messages/msg_producer.cc | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/messages/msg_queue.cc | 18 |
4 files changed, 12 insertions, 16 deletions
diff --git a/gnuradio-runtime/lib/messages/msg_accepter.cc b/gnuradio-runtime/lib/messages/msg_accepter.cc index a0d2d840c6..cc86a6ff8a 100644 --- a/gnuradio-runtime/lib/messages/msg_accepter.cc +++ b/gnuradio-runtime/lib/messages/msg_accepter.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <messages/msg_accepter.h> +#include <gnuradio/messages/msg_accepter.h> namespace gr { namespace messages { diff --git a/gnuradio-runtime/lib/messages/msg_accepter_msgq.cc b/gnuradio-runtime/lib/messages/msg_accepter_msgq.cc index adbea5ebc6..7ee6ea02c1 100644 --- a/gnuradio-runtime/lib/messages/msg_accepter_msgq.cc +++ b/gnuradio-runtime/lib/messages/msg_accepter_msgq.cc @@ -23,9 +23,7 @@ #include <config.h> #endif -#include <messages/msg_accepter_msgq.h> - -using namespace pmt; +#include <gnuradio/messages/msg_accepter_msgq.h> namespace gr { namespace messages { @@ -41,7 +39,7 @@ namespace gr { } void - msg_accepter_msgq::post(pmt_t msg) + msg_accepter_msgq::post(pmt::pmt_t msg) { d_msg_queue->insert_tail(msg); } diff --git a/gnuradio-runtime/lib/messages/msg_producer.cc b/gnuradio-runtime/lib/messages/msg_producer.cc index c354422aa6..3f56bc6637 100644 --- a/gnuradio-runtime/lib/messages/msg_producer.cc +++ b/gnuradio-runtime/lib/messages/msg_producer.cc @@ -24,7 +24,7 @@ #include "config.h" #endif -#include <messages/msg_producer.h> +#include <gnuradio/messages/msg_producer.h> namespace gr { namespace messages { diff --git a/gnuradio-runtime/lib/messages/msg_queue.cc b/gnuradio-runtime/lib/messages/msg_queue.cc index 0d460dc05c..6db2d2daa2 100644 --- a/gnuradio-runtime/lib/messages/msg_queue.cc +++ b/gnuradio-runtime/lib/messages/msg_queue.cc @@ -24,11 +24,9 @@ #include "config.h" #endif -#include <messages/msg_queue.h> +#include <gnuradio/messages/msg_queue.h> #include <stdexcept> -using namespace pmt; - namespace gr { namespace messages { @@ -49,7 +47,7 @@ namespace gr { } void - msg_queue::insert_tail(pmt_t msg) + msg_queue::insert_tail(pmt::pmt_t msg) { gr::thread::scoped_lock guard(d_mutex); @@ -60,7 +58,7 @@ namespace gr { d_not_empty.notify_one(); } - pmt_t + pmt::pmt_t msg_queue::delete_head() { gr::thread::scoped_lock guard(d_mutex); @@ -68,7 +66,7 @@ namespace gr { while(empty_p()) d_not_empty.wait(guard); - pmt_t m(d_msgs.front()); + pmt::pmt_t m(d_msgs.front()); d_msgs.pop_front(); if(d_limit > 0) // Unlimited length queues never block on write @@ -77,15 +75,15 @@ namespace gr { return m; } - pmt_t + pmt::pmt_t msg_queue::delete_head_nowait() { gr::thread::scoped_lock guard(d_mutex); if(empty_p()) - return pmt_t(); + return pmt::pmt_t(); - pmt_t m(d_msgs.front()); + pmt::pmt_t m(d_msgs.front()); d_msgs.pop_front(); if(d_limit > 0) // Unlimited length queues never block on write @@ -97,7 +95,7 @@ namespace gr { void msg_queue::flush() { - while(delete_head_nowait() != pmt_t()) + while(delete_head_nowait() != pmt::pmt_t()) ; } |