diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-01-29 17:21:17 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-02-15 11:12:54 -0800 |
| commit | 52138314a4daa8140b4dabca5ca4a9ffc6a8ff84 (patch) | |
| tree | 6f3f81880da4e6a0efa05908662ad6d4fdefd239 /host/lib/usrp/usrp1 | |
| parent | 5758533839a411906f70e29975a9e9ad2926fe89 (diff) | |
| download | uhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.tar.gz uhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.tar.bz2 uhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.zip | |
uhd: Replace all usage of boost::noncopyable with uhd::noncopyable
This fixes the build errors that occur due to switching locations of
noncopyable.hpp within Boost, and also allows us to remove
boost::noncopyable in one fell swoop.
Diffstat (limited to 'host/lib/usrp/usrp1')
| -rw-r--r-- | host/lib/usrp/usrp1/codec_ctrl.hpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/soft_time_ctrl.hpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_iface.hpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp1/codec_ctrl.hpp b/host/lib/usrp/usrp1/codec_ctrl.hpp index 7e5dae1e4..dd038fb82 100644 --- a/host/lib/usrp/usrp1/codec_ctrl.hpp +++ b/host/lib/usrp/usrp1/codec_ctrl.hpp @@ -10,15 +10,15 @@ #include <uhd/types/serial.hpp> #include <uhd/types/ranges.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> /*! * The usrp1 codec control: * - Init/power down codec. * - Read aux adc, write aux dac. */ -class usrp1_codec_ctrl : boost::noncopyable{ +class usrp1_codec_ctrl : uhd::noncopyable{ public: typedef boost::shared_ptr<usrp1_codec_ctrl> sptr; diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.hpp b/host/lib/usrp/usrp1/soft_time_ctrl.hpp index 28b65a3f9..1422a5ced 100644 --- a/host/lib/usrp/usrp1/soft_time_ctrl.hpp +++ b/host/lib/usrp/usrp1/soft_time_ctrl.hpp @@ -12,7 +12,7 @@ #include <uhd/types/time_spec.hpp> #include <uhd/types/metadata.hpp> #include <uhd/transport/bounded_buffer.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <boost/function.hpp> @@ -25,7 +25,7 @@ namespace uhd{ namespace usrp{ * timed transmits, timed receive commands, device time, * and inline and async error messages. */ -class soft_time_ctrl : boost::noncopyable{ +class soft_time_ctrl : uhd::noncopyable{ public: typedef boost::shared_ptr<soft_time_ctrl> sptr; typedef boost::function<void(bool)> cb_fcn_type; diff --git a/host/lib/usrp/usrp1/usrp1_iface.hpp b/host/lib/usrp/usrp1/usrp1_iface.hpp index 4ae4e83e0..4fb5cd4ee 100644 --- a/host/lib/usrp/usrp1/usrp1_iface.hpp +++ b/host/lib/usrp/usrp1/usrp1_iface.hpp @@ -12,7 +12,7 @@ #include <uhd/types/wb_iface.hpp> #include <uhd/types/serial.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #define SPI_ENABLE_FPGA 0x01 #define SPI_FMT_HDR_MASK (3 << 5) @@ -32,7 +32,7 @@ * Provides a set of functions to implementation layer. * Including spi, peek, poke, control... */ -class usrp1_iface : public uhd::wb_iface, public uhd::i2c_iface, public uhd::spi_iface, boost::noncopyable +class usrp1_iface : public uhd::wb_iface, public uhd::i2c_iface, public uhd::spi_iface, uhd::noncopyable { public: typedef boost::shared_ptr<usrp1_iface> sptr; |