diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-uhd/include | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-uhd/include')
| -rw-r--r-- | gr-uhd/include/uhd/amsg_source.h | 6 | ||||
| -rw-r--r-- | gr-uhd/include/uhd/usrp_sink.h | 4 | ||||
| -rw-r--r-- | gr-uhd/include/uhd/usrp_source.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gr-uhd/include/uhd/amsg_source.h b/gr-uhd/include/uhd/amsg_source.h index 819f6edad2..cf5c2e7628 100644 --- a/gr-uhd/include/uhd/amsg_source.h +++ b/gr-uhd/include/uhd/amsg_source.h @@ -25,7 +25,7 @@ #include <uhd/api.h> #include <uhd/usrp/multi_usrp.hpp> -#include <gr_msg_queue.h> +#include <gnuradio/msg_queue.h> namespace gr { namespace uhd { @@ -43,14 +43,14 @@ namespace gr { * \ingroup uhd_blk */ static sptr make(const ::uhd::device_addr_t &device_addr, - gr_msg_queue_sptr msgq); + msg_queue::sptr msgq); /*! * Convert a raw asynchronous message to an asynchronous metatdata object. * \return The asynchronous metadata object. */ static ::uhd::async_metadata_t - msg_to_async_metadata_t(const gr_message_sptr msg); + msg_to_async_metadata_t(const message::sptr msg); }; } /* namespace uhd */ diff --git a/gr-uhd/include/uhd/usrp_sink.h b/gr-uhd/include/uhd/usrp_sink.h index c54689241b..2d7c014f6b 100644 --- a/gr-uhd/include/uhd/usrp_sink.h +++ b/gr-uhd/include/uhd/usrp_sink.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_UHD_USRP_SINK_H #include <uhd/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> #include <uhd/usrp/multi_usrp.hpp> #ifndef INCLUDED_UHD_STREAM_HPP @@ -53,7 +53,7 @@ namespace gr { class uhd_usrp_sink; - class GR_UHD_API usrp_sink : virtual public gr_sync_block + class GR_UHD_API usrp_sink : virtual public sync_block { public: // gr::uhd::usrp_sink::sptr diff --git a/gr-uhd/include/uhd/usrp_source.h b/gr-uhd/include/uhd/usrp_source.h index 2348e73ed4..127e588a82 100644 --- a/gr-uhd/include/uhd/usrp_source.h +++ b/gr-uhd/include/uhd/usrp_source.h @@ -24,7 +24,7 @@ #define INCLUDED_GR_UHD_USRP_SOURCE_H #include <uhd/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> #include <uhd/usrp/multi_usrp.hpp> #ifndef INCLUDED_UHD_STREAM_HPP @@ -53,7 +53,7 @@ namespace gr { class uhd_usrp_source; - class GR_UHD_API usrp_source : virtual public gr_sync_block + class GR_UHD_API usrp_source : virtual public sync_block { public: // gr::uhd::usrp_source::sptr |