From 774dd1a8fd6d4046302819ddd8638f29dcd82779 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 22 Jun 2018 11:57:33 -0700 Subject: 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. --- host/include/uhd/usrp/multi_usrp.hpp | 8 +++++--- 1 file 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 #include -#include #include #include #include @@ -41,7 +40,10 @@ #include #include -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 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; -- cgit v1.2.3