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/transport | |
| 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/transport')
| -rw-r--r-- | host/lib/transport/libusb1_base.hpp | 12 | ||||
| -rw-r--r-- | host/lib/transport/xport_benchmarker.hpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/host/lib/transport/libusb1_base.hpp b/host/lib/transport/libusb1_base.hpp index 8ff1cf4cc..deb535ecb 100644 --- a/host/lib/transport/libusb1_base.hpp +++ b/host/lib/transport/libusb1_base.hpp @@ -12,7 +12,7 @@ #include <uhd/transport/usb_device_handle.hpp> #include <libusb.h> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> //! Define LIBUSB_CALL when its missing (non-windows) #ifndef LIBUSB_CALL @@ -49,7 +49,7 @@ namespace uhd { namespace transport { namespace libusb { * The get global session call will create a new context if none exists. * When all references to session are destroyed, the context will be freed. */ -class session : boost::noncopyable +class session : uhd::noncopyable { public: typedef boost::shared_ptr<session> sptr; @@ -75,7 +75,7 @@ public: /*! * Holds a device pointer with a reference to the session. */ -class device : boost::noncopyable +class device : uhd::noncopyable { public: typedef boost::shared_ptr<device> sptr; @@ -90,7 +90,7 @@ public: * This device list class holds a device list that will be * automatically freed when the last reference is destroyed. */ -class device_list : boost::noncopyable +class device_list : uhd::noncopyable { public: typedef boost::shared_ptr<device_list> sptr; @@ -110,7 +110,7 @@ public: /*! * Holds a device descriptor and a reference to the device. */ -class device_descriptor : boost::noncopyable +class device_descriptor : uhd::noncopyable { public: typedef boost::shared_ptr<device_descriptor> sptr; @@ -129,7 +129,7 @@ public: /*! * Holds a device handle and a reference to the device. */ -class device_handle : boost::noncopyable +class device_handle : uhd::noncopyable { public: typedef boost::shared_ptr<device_handle> sptr; diff --git a/host/lib/transport/xport_benchmarker.hpp b/host/lib/transport/xport_benchmarker.hpp index bd12c0ad8..3843540e0 100644 --- a/host/lib/transport/xport_benchmarker.hpp +++ b/host/lib/transport/xport_benchmarker.hpp @@ -18,7 +18,7 @@ namespace uhd { namespace transport { // Test class to benchmark a low-level transport object with a VITA/C-VITA data stream -class xport_benchmarker : boost::noncopyable +class xport_benchmarker : uhd::noncopyable { public: const device_addr_t& benchmark_throughput_chdr(zero_copy_if::sptr tx_transport, |