diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gnuradio-runtime/include/gr_basic_block.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/include/gr_basic_block.h')
| -rw-r--r-- | gnuradio-runtime/include/gr_basic_block.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/include/gr_basic_block.h b/gnuradio-runtime/include/gr_basic_block.h index 1fa8bb9d7a..beb54dbb6b 100644 --- a/gnuradio-runtime/include/gr_basic_block.h +++ b/gnuradio-runtime/include/gr_basic_block.h @@ -33,7 +33,7 @@ #include <deque> #include <map> #include <gr_io_signature.h> -#include <gruel/thread.h> +#include <thread/thread.h> #include <boost/foreach.hpp> #include <boost/thread/condition_variable.hpp> #include <iostream> @@ -68,7 +68,7 @@ class GR_RUNTIME_API gr_basic_block : public gr_msg_accepter, public boost::enab typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comperator>::iterator msg_queue_map_itr; std::map<pmt::pmt_t, boost::shared_ptr<boost::condition_variable>, pmt::comperator> msg_queue_ready; - gruel::mutex mutex; //< protects all vars + gr::thread::mutex mutex; //< protects all vars protected: friend class gr_flowgraph; |