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/lib/gr_top_block_impl.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/lib/gr_top_block_impl.h')
| -rw-r--r-- | gnuradio-runtime/lib/gr_top_block_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/lib/gr_top_block_impl.h b/gnuradio-runtime/lib/gr_top_block_impl.h index 7293531090..345a33152f 100644 --- a/gnuradio-runtime/lib/gr_top_block_impl.h +++ b/gnuradio-runtime/lib/gr_top_block_impl.h @@ -25,7 +25,7 @@ #include <gr_runtime_api.h> #include <gr_scheduler.h> -#include <gruel/thread.h> +#include <thread/thread.h> /*! *\brief Abstract implementation details of gr_top_block @@ -76,7 +76,7 @@ protected: gr_flat_flowgraph_sptr d_ffg; gr_scheduler_sptr d_scheduler; - gruel::mutex d_mutex; // protects d_state and d_lock_count + gr::thread::mutex d_mutex; // protects d_state and d_lock_count tb_state d_state; int d_lock_count; int d_max_noutput_items; |