diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-06-22 11:57:33 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-06-22 12:58:32 -0700 |
| commit | 774dd1a8fd6d4046302819ddd8638f29dcd82779 (patch) | |
| tree | 4d897532acbdbdbb2638ab36a07ec12997552ba7 /host | |
| parent | 1ae324575c203dc5fdb7ac4833562fd8c9860235 (diff) | |
| download | uhd-774dd1a8fd6d4046302819ddd8638f29dcd82779.tar.gz uhd-774dd1a8fd6d4046302819ddd8638f29dcd82779.tar.bz2 uhd-774dd1a8fd6d4046302819ddd8638f29dcd82779.zip | |
multi_usrp: Forward-declare device3
There is no need to include it in multi_usrp.hpp, and in fact, it will
break stuff when ENABLE_RFNOC=OFF, which is currently the default.
Diffstat (limited to 'host')
| -rw-r--r-- | host/include/uhd/usrp/multi_usrp.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index 0fff6246b..5177bb03d 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -25,7 +25,6 @@ #include <uhd/config.hpp> #include <uhd/device.hpp> -#include <uhd/device3.hpp> #include <uhd/deprecated.hpp> #include <uhd/types/ranges.hpp> #include <uhd/types/stream_cmd.hpp> @@ -41,7 +40,10 @@ #include <string> #include <vector> -namespace uhd{ namespace usrp{ +namespace uhd { + class device3; + + namespace usrp{ /*! * The Multi-USRP device class: @@ -135,7 +137,7 @@ public: * \return The uhd::device3 object for this USRP. * \throws uhd::type_error if this device is not actually a generation-3 device. */ - virtual device3::sptr get_device3(void) = 0; + virtual boost::shared_ptr<uhd::device3> get_device3(void) = 0; //! Convenience method to get a RX streamer. See also uhd::device::get_rx_stream(). virtual rx_streamer::sptr get_rx_stream(const stream_args_t &args) = 0; |