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 /gr-uhd/lib | |
| 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 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-uhd/lib/amsg_source_impl.cc | 2 | ||||
| -rw-r--r-- | gr-uhd/lib/amsg_source_impl.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index fe95fcb7ef..9121dd41b8 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -24,7 +24,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${GR_UHD_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${UHD_INCLUDE_DIRS} diff --git a/gr-uhd/lib/amsg_source_impl.cc b/gr-uhd/lib/amsg_source_impl.cc index 76603e4989..cf344db202 100644 --- a/gr-uhd/lib/amsg_source_impl.cc +++ b/gr-uhd/lib/amsg_source_impl.cc @@ -48,7 +48,7 @@ namespace gr { { _dev = ::uhd::usrp::multi_usrp::make(device_addr); _amsg_thread = - gruel::thread(boost::bind(&amsg_source_impl::recv_loop, this)); + gr::thread::thread(boost::bind(&amsg_source_impl::recv_loop, this)); } amsg_source_impl::~amsg_source_impl() diff --git a/gr-uhd/lib/amsg_source_impl.h b/gr-uhd/lib/amsg_source_impl.h index 2928e85adb..f0f3d4bfb1 100644 --- a/gr-uhd/lib/amsg_source_impl.h +++ b/gr-uhd/lib/amsg_source_impl.h @@ -21,7 +21,7 @@ */ #include <uhd/amsg_source.h> -#include <gruel/thread.h> +#include <thread/thread.h> namespace gr { namespace uhd { @@ -38,7 +38,7 @@ namespace gr { protected: ::uhd::usrp::multi_usrp::sptr _dev; - gruel::thread _amsg_thread; + gr::thread::thread _amsg_thread; gr_msg_queue_sptr _msgq; bool _running; }; |