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_scheduler_sts.cc | |
| 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_scheduler_sts.cc')
| -rw-r--r-- | gnuradio-runtime/lib/gr_scheduler_sts.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/lib/gr_scheduler_sts.cc b/gnuradio-runtime/lib/gr_scheduler_sts.cc index 2c96def6d1..10f01edaf6 100644 --- a/gnuradio-runtime/lib/gr_scheduler_sts.cc +++ b/gnuradio-runtime/lib/gr_scheduler_sts.cc @@ -24,7 +24,7 @@ #endif #include <gr_scheduler_sts.h> #include <gr_single_threaded_scheduler.h> -#include <gruel/thread_body_wrapper.h> +#include <thread/thread_body_wrapper.h> class sts_container { @@ -64,7 +64,7 @@ gr_scheduler_sts::gr_scheduler_sts(gr_flat_flowgraph_sptr ffg, int max_noutput_i gr_block_vector_t blocks = gr_flat_flowgraph::make_block_vector(*p); d_threads.create_thread( - gruel::thread_body_wrapper<sts_container>(sts_container(blocks), + gr::thread::thread_body_wrapper<sts_container>(sts_container(blocks), "single-threaded-scheduler")); } } |