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 /gr-blocks/lib/udp_source_impl.h | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/lib/udp_source_impl.h')
| -rw-r--r-- | gr-blocks/lib/udp_source_impl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-blocks/lib/udp_source_impl.h b/gr-blocks/lib/udp_source_impl.h index 8927f5f933..d6c773726b 100644 --- a/gr-blocks/lib/udp_source_impl.h +++ b/gr-blocks/lib/udp_source_impl.h @@ -26,7 +26,7 @@ #include <blocks/udp_source.h> #include <boost/asio.hpp> #include <boost/format.hpp> -#include <gruel/thread.h> +#include <thread/thread.h> namespace gr { namespace blocks { @@ -52,9 +52,9 @@ namespace gr { boost::asio::ip::udp::endpoint d_endpoint_rcvd; boost::asio::io_service d_io_service; - gruel::condition_variable d_cond_wait; - gruel::mutex d_udp_mutex; - gruel::thread d_udp_thread; + gr::thread::condition_variable d_cond_wait; + gr::thread::mutex d_udp_mutex; + gr::thread::thread d_udp_thread; void start_receive(); void handle_read(const boost::system::error_code& error, |