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/usrp2 | |
| 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/usrp2')
| -rw-r--r-- | host/lib/usrp/usrp2/clock_ctrl.hpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/codec_ctrl.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/clock_ctrl.hpp b/host/lib/usrp/usrp2/clock_ctrl.hpp index 96a1a0714..53f0d0aef 100644 --- a/host/lib/usrp/usrp2/clock_ctrl.hpp +++ b/host/lib/usrp/usrp2/clock_ctrl.hpp @@ -9,11 +9,11 @@ #define INCLUDED_CLOCK_CTRL_HPP #include "usrp2_iface.hpp" +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> #include <vector> -class usrp2_clock_ctrl : boost::noncopyable{ +class usrp2_clock_ctrl : uhd::noncopyable{ public: typedef boost::shared_ptr<usrp2_clock_ctrl> sptr; diff --git a/host/lib/usrp/usrp2/codec_ctrl.hpp b/host/lib/usrp/usrp2/codec_ctrl.hpp index ac808e357..37c8d6fa3 100644 --- a/host/lib/usrp/usrp2/codec_ctrl.hpp +++ b/host/lib/usrp/usrp2/codec_ctrl.hpp @@ -10,9 +10,9 @@ #include "usrp2_iface.hpp" #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> -class usrp2_codec_ctrl : boost::noncopyable{ +class usrp2_codec_ctrl : uhd::noncopyable{ public: typedef boost::shared_ptr<usrp2_codec_ctrl> sptr; |