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.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_scheduler_sts.h')
| -rw-r--r-- | gnuradio-runtime/lib/gr_scheduler_sts.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-runtime/lib/gr_scheduler_sts.h b/gnuradio-runtime/lib/gr_scheduler_sts.h index 43b97b62c1..af98c6d8ba 100644 --- a/gnuradio-runtime/lib/gr_scheduler_sts.h +++ b/gnuradio-runtime/lib/gr_scheduler_sts.h @@ -23,14 +23,14 @@ #include <gr_runtime_api.h> #include <gr_scheduler.h> -#include <gruel/thread_group.h> +#include <thread/thread_group.h> /*! * \brief Concrete scheduler that uses the single_threaded_scheduler */ class GR_RUNTIME_API gr_scheduler_sts : public gr_scheduler { - gruel::thread_group d_threads; + gr::thread::thread_group d_threads; protected: /*! |