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/b100 | |
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/b100')
-rw-r--r-- | host/lib/usrp/b100/clock_ctrl.hpp | 4 | ||||
-rw-r--r-- | host/lib/usrp/b100/codec_ctrl.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/b100/clock_ctrl.hpp b/host/lib/usrp/b100/clock_ctrl.hpp index 4d014208c..a6f516e15 100644 --- a/host/lib/usrp/b100/clock_ctrl.hpp +++ b/host/lib/usrp/b100/clock_ctrl.hpp @@ -9,15 +9,15 @@ #define INCLUDED_B100_CLOCK_CTRL_HPP #include <uhd/types/serial.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> #include <vector> /*! * The B100 clock control: * - Disable/enable clock lines. */ -class b100_clock_ctrl : boost::noncopyable{ +class b100_clock_ctrl : uhd::noncopyable{ public: typedef boost::shared_ptr<b100_clock_ctrl> sptr; diff --git a/host/lib/usrp/b100/codec_ctrl.hpp b/host/lib/usrp/b100/codec_ctrl.hpp index cd7b0bfdf..67a5f7e9c 100644 --- a/host/lib/usrp/b100/codec_ctrl.hpp +++ b/host/lib/usrp/b100/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 B100 codec control: * - Init/power down codec. * - Read aux adc, write aux dac. */ -class b100_codec_ctrl : boost::noncopyable{ +class b100_codec_ctrl : uhd::noncopyable{ public: typedef boost::shared_ptr<b100_codec_ctrl> sptr; |