diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-29 17:31:06 -0400 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-01 16:23:06 -0700 |
| commit | f74d3dae8f2ec423c61932b4ad0359f98b996a51 (patch) | |
| tree | 1e16eb3537829248c177b04209acce3fe2bead96 /gnuradio-runtime/include/gr_basic_block.h | |
| parent | eea0e411411303ea94953c5cd8454c4139a474ff (diff) | |
gruel: moved gruel into subdirs of gnuradio-runtime.
PMTs are handled slightly different and are installed into their own module and include dir.
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; |