diff options
Diffstat (limited to 'host')
84 files changed, 173 insertions, 164 deletions
diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp index 9aecdc088..d2bf4785c 100644 --- a/host/include/uhd/device.hpp +++ b/host/include/uhd/device.hpp @@ -13,9 +13,9 @@ #include <uhd/property_tree.hpp> #include <uhd/stream.hpp> #include <uhd/types/device_addr.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/function.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> namespace uhd { @@ -25,7 +25,7 @@ class property_tree; // forward declaration * The device interface represents the hardware. * The API allows for discovery, configuration, and streaming. */ -class UHD_API device : boost::noncopyable +class UHD_API device : uhd::noncopyable { public: typedef boost::shared_ptr<device> sptr; diff --git a/host/include/uhd/image_loader.hpp b/host/include/uhd/image_loader.hpp index 3b4b9133e..b52bb9b1f 100644 --- a/host/include/uhd/image_loader.hpp +++ b/host/include/uhd/image_loader.hpp @@ -11,12 +11,12 @@ #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> #include <boost/function.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <string> namespace uhd { -class UHD_API image_loader : boost::noncopyable +class UHD_API image_loader : uhd::noncopyable { public: typedef struct diff --git a/host/include/uhd/property_tree.hpp b/host/include/uhd/property_tree.hpp index 173398986..18091511e 100644 --- a/host/include/uhd/property_tree.hpp +++ b/host/include/uhd/property_tree.hpp @@ -9,6 +9,7 @@ #define INCLUDED_UHD_PROPERTY_TREE_HPP #include <uhd/config.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/function.hpp> #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> @@ -63,7 +64,7 @@ namespace uhd { * - T must have a copy constructor * - T must have an assignment operator */ -template <typename T> class property : boost::noncopyable +template <typename T> class property : uhd::noncopyable { public: typedef boost::function<void(const T&)> subscriber_type; @@ -207,7 +208,7 @@ UHD_API fs_path operator/(const fs_path&, size_t); /*! * The property tree provides a file system structure for accessing properties. */ -class UHD_API property_tree : boost::noncopyable +class UHD_API property_tree : uhd::noncopyable { public: typedef boost::shared_ptr<property_tree> sptr; diff --git a/host/include/uhd/rfnoc/graph.hpp b/host/include/uhd/rfnoc/graph.hpp index b3372e389..d2038bbe5 100644 --- a/host/include/uhd/rfnoc/graph.hpp +++ b/host/include/uhd/rfnoc/graph.hpp @@ -10,11 +10,11 @@ #include <uhd/rfnoc/block_id.hpp> #include <uhd/types/sid.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> namespace uhd { namespace rfnoc { -class graph : boost::noncopyable +class graph : uhd::noncopyable { public: typedef boost::shared_ptr<uhd::rfnoc::graph> sptr; diff --git a/host/include/uhd/rfnoc/node_ctrl_base.hpp b/host/include/uhd/rfnoc/node_ctrl_base.hpp index 2251baf2d..c92dd3639 100644 --- a/host/include/uhd/rfnoc/node_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/node_ctrl_base.hpp @@ -11,6 +11,7 @@ #include <uhd/rfnoc/constants.hpp> #include <uhd/types/device_addr.hpp> #include <uhd/utils/log.hpp> +#include <uhd/utils/noncopyable.hpp> #include <stdint.h> #include <boost/enable_shared_from_this.hpp> #include <boost/function.hpp> @@ -27,7 +28,7 @@ namespace uhd { namespace rfnoc { * */ class UHD_RFNOC_API node_ctrl_base; -class node_ctrl_base : boost::noncopyable, +class node_ctrl_base : uhd::noncopyable, public boost::enable_shared_from_this<node_ctrl_base> { public: diff --git a/host/include/uhd/stream.hpp b/host/include/uhd/stream.hpp index 133893cf9..85f7eaa0f 100644 --- a/host/include/uhd/stream.hpp +++ b/host/include/uhd/stream.hpp @@ -13,6 +13,7 @@ #include <uhd/types/metadata.hpp> #include <uhd/types/ref_vector.hpp> #include <uhd/types/stream_cmd.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> #include <string> @@ -166,7 +167,7 @@ struct UHD_API stream_args_t * It represents the layer between the samples on the host * and samples inside the device's receive DSP processing. */ -class UHD_API rx_streamer : boost::noncopyable +class UHD_API rx_streamer : uhd::noncopyable { public: typedef boost::shared_ptr<rx_streamer> sptr; @@ -241,7 +242,7 @@ public: * It represents the layer between the samples on the host * and samples inside the device's transmit DSP processing. */ -class UHD_API tx_streamer : boost::noncopyable +class UHD_API tx_streamer : uhd::noncopyable { public: typedef boost::shared_ptr<tx_streamer> sptr; diff --git a/host/include/uhd/transport/bounded_buffer.ipp b/host/include/uhd/transport/bounded_buffer.ipp index 027a1babb..4db182508 100644 --- a/host/include/uhd/transport/bounded_buffer.ipp +++ b/host/include/uhd/transport/bounded_buffer.ipp @@ -9,6 +9,7 @@ #define INCLUDED_UHD_TRANSPORT_BOUNDED_BUFFER_IPP #include <uhd/config.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/bind.hpp> #include <boost/utility.hpp> #include <boost/function.hpp> @@ -18,7 +19,7 @@ namespace uhd{ namespace transport{ - template <typename elem_type> class bounded_buffer_detail : boost::noncopyable + template <typename elem_type> class bounded_buffer_detail : uhd::noncopyable { public: diff --git a/host/include/uhd/transport/buffer_pool.hpp b/host/include/uhd/transport/buffer_pool.hpp index 769c78180..53949cbaf 100644 --- a/host/include/uhd/transport/buffer_pool.hpp +++ b/host/include/uhd/transport/buffer_pool.hpp @@ -9,8 +9,8 @@ #define INCLUDED_UHD_TRANSPORT_BUFFER_POOL_HPP #include <uhd/config.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> namespace uhd { namespace transport { @@ -18,7 +18,7 @@ namespace uhd { namespace transport { * A buffer pool manages memory for a homogeneous set of buffers. * Each buffer is the pool start at a 16-byte alignment boundary. */ -class UHD_API buffer_pool : boost::noncopyable +class UHD_API buffer_pool : uhd::noncopyable { public: typedef boost::shared_ptr<buffer_pool> sptr; diff --git a/host/include/uhd/transport/muxed_zero_copy_if.hpp b/host/include/uhd/transport/muxed_zero_copy_if.hpp index f69e6f288..d8230aaf9 100644 --- a/host/include/uhd/transport/muxed_zero_copy_if.hpp +++ b/host/include/uhd/transport/muxed_zero_copy_if.hpp @@ -12,7 +12,7 @@ #include <uhd/transport/zero_copy.hpp> #include <stdint.h> #include <boost/function.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> namespace uhd { namespace transport { @@ -25,7 +25,7 @@ namespace uhd { namespace transport { * appropriate virtual streams with the given classifier * function. A worker therad is spawned to handle the demuxing. */ -class muxed_zero_copy_if : private boost::noncopyable +class muxed_zero_copy_if : private uhd::noncopyable { public: typedef boost::shared_ptr<muxed_zero_copy_if> sptr; diff --git a/host/include/uhd/transport/nirio/nirio_fifo.h b/host/include/uhd/transport/nirio/nirio_fifo.h index c4de3c30b..5f707e637 100644 --- a/host/include/uhd/transport/nirio/nirio_fifo.h +++ b/host/include/uhd/transport/nirio/nirio_fifo.h @@ -12,7 +12,7 @@ #include <uhd/transport/nirio/nirio_driver_iface.h> #include <uhd/transport/nirio/niriok_proxy.h> #include <uhd/transport/nirio/status.h> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/smart_ptr.hpp> #include <boost/thread/recursive_mutex.hpp> #include <boost/atomic/atomic.hpp> @@ -30,7 +30,7 @@ struct datatype_info_t { }; template <typename data_t> -class nirio_fifo : private boost::noncopyable +class nirio_fifo : private uhd::noncopyable { public: typedef boost::shared_ptr< nirio_fifo<data_t> > sptr; diff --git a/host/include/uhd/transport/nirio/niriok_proxy.h b/host/include/uhd/transport/nirio/niriok_proxy.h index f79942fe9..8bd877e30 100644 --- a/host/include/uhd/transport/nirio/niriok_proxy.h +++ b/host/include/uhd/transport/nirio/niriok_proxy.h @@ -10,7 +10,7 @@ #include <stdint.h> #include <boost/smart_ptr.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/thread/shared_mutex.hpp> #include <boost/thread/locks.hpp> #include <uhd/transport/nirio/nirio_driver_iface.h> @@ -133,7 +133,7 @@ namespace uhd { namespace niusrprio uint32_t version; }; - class UHD_API niriok_proxy : public boost::noncopyable { + class UHD_API niriok_proxy : public uhd::noncopyable { public: typedef boost::shared_ptr<niriok_proxy> sptr; @@ -252,7 +252,7 @@ namespace uhd { namespace niusrprio virtual void _close() = 0; }; - class niriok_scoped_addr_space : public boost::noncopyable { + class niriok_scoped_addr_space : public uhd::noncopyable { public: explicit niriok_scoped_addr_space(niriok_proxy::sptr proxy, nirio_addr_space_t addr_space, nirio_status& status) : driver_proxy(proxy) diff --git a/host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h b/host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h index 5a19ac384..edeadc34d 100644 --- a/host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h +++ b/host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h @@ -9,7 +9,7 @@ #define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_PROXY_IMPL_V1_H #include <boost/smart_ptr.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <uhd/transport/nirio/nirio_driver_iface.h> #include <uhd/transport/nirio/nirio_quirks.h> #include <uhd/transport/nirio/niriok_proxy.h> diff --git a/host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h b/host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h index c9bee4789..31013fbfc 100644 --- a/host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h +++ b/host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h @@ -9,7 +9,7 @@ #define INCLUDED_UHD_TRANSPORT_NIRIO_NIRIO_PROXY_IMPL_V2_H #include <boost/smart_ptr.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <uhd/transport/nirio/nirio_driver_iface.h> #include <uhd/transport/nirio/nirio_quirks.h> #include <uhd/transport/nirio/niriok_proxy.h> diff --git a/host/include/uhd/transport/nirio/niusrprio_session.h b/host/include/uhd/transport/nirio/niusrprio_session.h index 545b5082f..f6f0d78a1 100644 --- a/host/include/uhd/transport/nirio/niusrprio_session.h +++ b/host/include/uhd/transport/nirio/niusrprio_session.h @@ -14,14 +14,14 @@ #include <uhd/transport/nirio/niriok_proxy.h> #include <uhd/transport/nirio/nirio_resource_manager.h> #include <uhd/transport/nirio/nifpga_lvbitx.h> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/smart_ptr.hpp> #include <boost/thread/recursive_mutex.hpp> #include <string> namespace uhd { namespace niusrprio { -class UHD_API niusrprio_session : private boost::noncopyable +class UHD_API niusrprio_session : private uhd::noncopyable { public: typedef boost::shared_ptr<niusrprio_session> sptr; diff --git a/host/include/uhd/transport/nirio/rpc/rpc_client.hpp b/host/include/uhd/transport/nirio/rpc/rpc_client.hpp index 536210c31..fe89b95d3 100644 --- a/host/include/uhd/transport/nirio/rpc/rpc_client.hpp +++ b/host/include/uhd/transport/nirio/rpc/rpc_client.hpp @@ -10,6 +10,7 @@ #include "rpc_common.hpp" #include <uhd/utils/log.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/asio.hpp> #include <boost/smart_ptr.hpp> #include <boost/thread/condition_variable.hpp> @@ -17,7 +18,7 @@ namespace uhd { namespace usrprio_rpc { -class rpc_client : private boost::noncopyable +class rpc_client : private uhd::noncopyable { public: static const uint32_t CURRENT_VERSION = 1; diff --git a/host/include/uhd/transport/udp_simple.hpp b/host/include/uhd/transport/udp_simple.hpp index 19164d80b..a936cb204 100644 --- a/host/include/uhd/transport/udp_simple.hpp +++ b/host/include/uhd/transport/udp_simple.hpp @@ -10,13 +10,13 @@ #include <uhd/config.hpp> #include <uhd/types/serial.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/asio/buffer.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> namespace uhd { namespace transport { -class UHD_API udp_simple : boost::noncopyable +class UHD_API udp_simple : uhd::noncopyable { public: typedef boost::shared_ptr<udp_simple> sptr; diff --git a/host/include/uhd/transport/usb_control.hpp b/host/include/uhd/transport/usb_control.hpp index 3fc6d0394..fb37dc9fe 100644 --- a/host/include/uhd/transport/usb_control.hpp +++ b/host/include/uhd/transport/usb_control.hpp @@ -9,10 +9,12 @@ #define INCLUDED_UHD_TRANSPORT_USB_CONTROL_HPP #include <uhd/transport/usb_device_handle.hpp> +#include <uhd/utils/noncopyable.hpp> +#include <boost/shared_ptr.hpp> namespace uhd { namespace transport { -class UHD_API usb_control : boost::noncopyable +class UHD_API usb_control : uhd::noncopyable { public: typedef boost::shared_ptr<usb_control> sptr; diff --git a/host/include/uhd/transport/usb_device_handle.hpp b/host/include/uhd/transport/usb_device_handle.hpp index 3cd740771..adf7d8985 100644 --- a/host/include/uhd/transport/usb_device_handle.hpp +++ b/host/include/uhd/transport/usb_device_handle.hpp @@ -9,10 +9,10 @@ #define INCLUDED_UHD_TRANSPORT_USB_DEVICE_HANDLE_HPP #include <uhd/config.hpp> -#include <stdint.h> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> #include <vector> +#include <stdint.h> namespace uhd { namespace transport { @@ -28,7 +28,7 @@ namespace uhd { namespace transport { * a true descriptor serial number string. This interface returns the * actual string descriptor. */ -class UHD_API usb_device_handle : boost::noncopyable +class UHD_API usb_device_handle : uhd::noncopyable { public: typedef boost::shared_ptr<usb_device_handle> sptr; diff --git a/host/include/uhd/transport/zero_copy.hpp b/host/include/uhd/transport/zero_copy.hpp index 05582f902..09b39f454 100644 --- a/host/include/uhd/transport/zero_copy.hpp +++ b/host/include/uhd/transport/zero_copy.hpp @@ -9,6 +9,7 @@ #define INCLUDED_UHD_TRANSPORT_ZERO_COPY_HPP #include <uhd/config.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/detail/atomic_count.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/shared_ptr.hpp> @@ -162,7 +163,7 @@ struct zero_copy_xport_params * Provides a way to get send and receive buffers * with memory managed by the transport object. */ -class UHD_API zero_copy_if : boost::noncopyable +class UHD_API zero_copy_if : uhd::noncopyable { public: typedef boost::shared_ptr<zero_copy_if> sptr; diff --git a/host/include/uhd/usrp/dboard_base.hpp b/host/include/uhd/usrp/dboard_base.hpp index 8f9873399..25f5b816d 100644 --- a/host/include/uhd/usrp/dboard_base.hpp +++ b/host/include/uhd/usrp/dboard_base.hpp @@ -14,7 +14,7 @@ #include <uhd/usrp/dboard_iface.hpp> #include <uhd/utils/pimpl.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> namespace uhd { namespace usrp { @@ -22,7 +22,7 @@ namespace uhd { namespace usrp { * A daughter board dboard_base class for all dboards. * Only other dboard dboard_base classes should inherit this. */ -class UHD_API dboard_base : boost::noncopyable +class UHD_API dboard_base : uhd::noncopyable { public: typedef boost::shared_ptr<dboard_base> sptr; diff --git a/host/include/uhd/usrp/dboard_manager.hpp b/host/include/uhd/usrp/dboard_manager.hpp index cda1127fb..eb255c346 100644 --- a/host/include/uhd/usrp/dboard_manager.hpp +++ b/host/include/uhd/usrp/dboard_manager.hpp @@ -13,7 +13,7 @@ #include <uhd/usrp/dboard_eeprom.hpp> #include <uhd/usrp/dboard_id.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <string> #include <vector> @@ -24,7 +24,7 @@ namespace uhd { namespace usrp { * Create subdev instances for each subdev on a dboard. * Provide wax::obj access to the subdevs inside. */ -class UHD_API dboard_manager : boost::noncopyable +class UHD_API dboard_manager : uhd::noncopyable { public: typedef boost::shared_ptr<dboard_manager> sptr; diff --git a/host/include/uhd/usrp/gps_ctrl.hpp b/host/include/uhd/usrp/gps_ctrl.hpp index 91d653759..a3485226c 100644 --- a/host/include/uhd/usrp/gps_ctrl.hpp +++ b/host/include/uhd/usrp/gps_ctrl.hpp @@ -10,14 +10,13 @@ #include <uhd/types/sensors.hpp> #include <uhd/types/serial.hpp> -#include <boost/function.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> #include <vector> namespace uhd { -class UHD_API gps_ctrl : boost::noncopyable +class UHD_API gps_ctrl : uhd::noncopyable { public: typedef boost::shared_ptr<gps_ctrl> sptr; diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index 3c52e907a..0abb9186d 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -37,7 +37,7 @@ #include <uhd/usrp/dboard_iface.hpp> #include <uhd/usrp/subdev_spec.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <complex> #include <string> #include <vector> @@ -93,7 +93,7 @@ namespace usrp { * * </pre> */ -class UHD_API multi_usrp : boost::noncopyable +class UHD_API multi_usrp : uhd::noncopyable { public: typedef boost::shared_ptr<multi_usrp> sptr; diff --git a/host/include/uhd/usrp_clock/multi_usrp_clock.hpp b/host/include/uhd/usrp_clock/multi_usrp_clock.hpp index 05759c383..48f8a5eae 100644 --- a/host/include/uhd/usrp_clock/multi_usrp_clock.hpp +++ b/host/include/uhd/usrp_clock/multi_usrp_clock.hpp @@ -42,7 +42,7 @@ namespace uhd { namespace usrp_clock { * multi_usrp_clock::sptr clock = multi_usrp_clock::make(dev); * </pre> */ -class UHD_API multi_usrp_clock : boost::noncopyable +class UHD_API multi_usrp_clock : uhd::noncopyable { public: typedef boost::shared_ptr<multi_usrp_clock> sptr; diff --git a/host/include/uhd/utils/gain_group.hpp b/host/include/uhd/utils/gain_group.hpp index 9822f3620..f85e841dc 100644 --- a/host/include/uhd/utils/gain_group.hpp +++ b/host/include/uhd/utils/gain_group.hpp @@ -12,7 +12,7 @@ #include <uhd/types/ranges.hpp> #include <boost/function.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <string> #include <vector> @@ -28,7 +28,7 @@ struct UHD_API gain_fcns_t boost::function<void(double)> set_value; }; -class UHD_API gain_group : boost::noncopyable +class UHD_API gain_group : uhd::noncopyable { public: typedef boost::shared_ptr<gain_group> sptr; diff --git a/host/include/uhd/utils/msg_task.hpp b/host/include/uhd/utils/msg_task.hpp index f19f8010d..4e73b7720 100644 --- a/host/include/uhd/utils/msg_task.hpp +++ b/host/include/uhd/utils/msg_task.hpp @@ -14,11 +14,11 @@ #include <boost/function.hpp> #include <boost/optional/optional.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <vector> namespace uhd { -class UHD_API msg_task : boost::noncopyable +class UHD_API msg_task : uhd::noncopyable { public: typedef boost::shared_ptr<msg_task> sptr; diff --git a/host/include/uhd/utils/soft_register.hpp b/host/include/uhd/utils/soft_register.hpp index 5a1d175e0..b31f36be7 100644 --- a/host/include/uhd/utils/soft_register.hpp +++ b/host/include/uhd/utils/soft_register.hpp @@ -13,7 +13,7 @@ #include <uhd/utils/dirty_tracked.hpp> #include <stdint.h> #include <boost/foreach.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/thread/locks.hpp> #include <boost/thread/mutex.hpp> #include <boost/tokenizer.hpp> @@ -100,7 +100,7 @@ template <typename data_t> UHD_INLINE data_t mask(const soft_reg_field_t field) } } // namespace soft_reg_field -class soft_register_base : public boost::noncopyable +class soft_register_base : public uhd::noncopyable { public: virtual ~soft_register_base() {} @@ -473,7 +473,7 @@ public: * Methods give convenient field-level access to soft-copy and the ability * to do read-modify-write operations. */ -class UHD_API soft_regmap_t : public soft_regmap_accessor_t, public boost::noncopyable +class UHD_API soft_regmap_t : public soft_regmap_accessor_t, public uhd::noncopyable { public: soft_regmap_t(const std::string& name) : _name(name) {} @@ -595,7 +595,7 @@ private: * fashion. * A regmap_db *does not* manage storage for regmaps. It is simply a wrapper. */ -class UHD_API soft_regmap_db_t : public soft_regmap_accessor_t, public boost::noncopyable +class UHD_API soft_regmap_db_t : public soft_regmap_accessor_t, public uhd::noncopyable { public: typedef boost::shared_ptr<soft_regmap_db_t> sptr; diff --git a/host/include/uhd/utils/tasks.hpp b/host/include/uhd/utils/tasks.hpp index 5131fa028..fdb3869ee 100644 --- a/host/include/uhd/utils/tasks.hpp +++ b/host/include/uhd/utils/tasks.hpp @@ -10,13 +10,14 @@ #define INCLUDED_UHD_UTILS_TASKS_HPP #include <uhd/config.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/function.hpp> #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> namespace uhd { -class UHD_API task : boost::noncopyable +class UHD_API task : uhd::noncopyable { public: typedef boost::shared_ptr<task> sptr; diff --git a/host/lib/include/uhdlib/experts/expert_container.hpp b/host/lib/include/uhdlib/experts/expert_container.hpp index c50e45847..5c8df5f1a 100644 --- a/host/lib/include/uhdlib/experts/expert_container.hpp +++ b/host/lib/include/uhdlib/experts/expert_container.hpp @@ -10,7 +10,7 @@ #include <uhdlib/experts/expert_nodes.hpp> #include <uhd/config.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <boost/thread/recursive_mutex.hpp> @@ -23,7 +23,7 @@ namespace uhd { namespace experts { AUTO_RESOLVE_ON_READ_WRITE }; - class UHD_API expert_container : private boost::noncopyable, public node_retriever_t { + class UHD_API expert_container : private uhd::noncopyable, public node_retriever_t { public: //Methods typedef boost::shared_ptr<expert_container> sptr; diff --git a/host/lib/include/uhdlib/experts/expert_factory.hpp b/host/lib/include/uhdlib/experts/expert_factory.hpp index 72798eccc..e7164e00e 100644 --- a/host/lib/include/uhdlib/experts/expert_factory.hpp +++ b/host/lib/include/uhdlib/experts/expert_factory.hpp @@ -11,7 +11,7 @@ #include <uhdlib/experts/expert_container.hpp> #include <uhd/property_tree.hpp> #include <uhd/config.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/bind.hpp> #include <memory> @@ -28,7 +28,7 @@ namespace uhd { namespace experts { * storage on destruction. * */ - class UHD_API expert_factory : public boost::noncopyable { + class UHD_API expert_factory : public uhd::noncopyable { public: /*! diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp index 1aa29b3a3..e698b3a71 100644 --- a/host/lib/include/uhdlib/experts/expert_nodes.hpp +++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp @@ -11,12 +11,8 @@ #include <uhd/config.hpp> #include <uhd/exception.hpp> #include <uhd/utils/dirty_tracked.hpp> +#include <uhd/utils/noncopyable.hpp> #include <uhd/types/time_spec.hpp> -#if BOOST_VERSION >= 105600 -#include <boost/core/noncopyable.hpp> -#else -#include <boost/noncopyable.hpp> -#endif #include <boost/function.hpp> #include <boost/thread/recursive_mutex.hpp> #include <boost/thread.hpp> @@ -38,7 +34,7 @@ namespace uhd { namespace experts { * graph. Data nodes and workers are derived from this class. * --------------------------------------------------------- */ - class dag_vertex_t : private boost::noncopyable { + class dag_vertex_t : private uhd::noncopyable { public: typedef boost::function<void(std::string)> callback_func_t; diff --git a/host/lib/include/uhdlib/rfnoc/async_msg_handler.hpp b/host/lib/include/uhdlib/rfnoc/async_msg_handler.hpp index 6c62f2434..cd1aed37d 100644 --- a/host/lib/include/uhdlib/rfnoc/async_msg_handler.hpp +++ b/host/lib/include/uhdlib/rfnoc/async_msg_handler.hpp @@ -13,7 +13,7 @@ #include <uhd/types/sid.hpp> #include <uhd/types/endianness.hpp> #include <uhdlib/rfnoc/async_msg.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <functional> namespace uhd { namespace rfnoc { @@ -21,7 +21,7 @@ namespace uhd { namespace rfnoc { /*! Async message handler for a uhd::rfnoc::graph * */ -class async_msg_handler : boost::noncopyable +class async_msg_handler : uhd::noncopyable { public: typedef boost::shared_ptr<async_msg_handler> sptr; diff --git a/host/lib/include/uhdlib/transport/dpdk_common.hpp b/host/lib/include/uhdlib/transport/dpdk_common.hpp index 2f320e79e..0db51e80f 100644 --- a/host/lib/include/uhdlib/transport/dpdk_common.hpp +++ b/host/lib/include/uhdlib/transport/dpdk_common.hpp @@ -10,6 +10,7 @@ #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> #include <uhd/utils/static.hpp> +#include <uhd/utils/noncopyable.hpp> #include <array> #include <atomic> #include <mutex> @@ -17,7 +18,7 @@ namespace uhd { namespace transport { -class uhd_dpdk_ctx : boost::noncopyable { +class uhd_dpdk_ctx : uhd::noncopyable { public: UHD_SINGLETON_FCN(uhd_dpdk_ctx, get); diff --git a/host/lib/include/uhdlib/transport/dpdk_simple.hpp b/host/lib/include/uhdlib/transport/dpdk_simple.hpp index 62728b38d..51618b5e7 100644 --- a/host/lib/include/uhdlib/transport/dpdk_simple.hpp +++ b/host/lib/include/uhdlib/transport/dpdk_simple.hpp @@ -7,11 +7,12 @@ #ifndef INCLUDED_DPDK_SIMPLE_HPP #define INCLUDED_DPDK_SIMPLE_HPP +#include <uhd/utils/noncopyable.hpp> #include <uhdlib/transport/dpdk_common.hpp> namespace uhd { namespace transport { -class dpdk_simple : boost::noncopyable +class dpdk_simple : uhd::noncopyable { public: typedef boost::shared_ptr<dpdk_simple> sptr; diff --git a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp index 30c3987e1..99d74d80f 100644 --- a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp +++ b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp @@ -37,7 +37,7 @@ namespace uhd { namespace usrp { * * Frontend numbering is as designed by the AD9361. */ -class ad9361_ctrl : public boost::noncopyable +class ad9361_ctrl : public uhd::noncopyable { public: typedef boost::shared_ptr<ad9361_ctrl> sptr; diff --git a/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp index 258aa7d04..6aafa885b 100644 --- a/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp +++ b/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp @@ -10,8 +10,8 @@ #include <uhd/transport/usb_control.hpp> #include <uhd/types/serial.hpp> //i2c iface +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> #define FL_BEGIN 0 #define FL_END 2 @@ -32,7 +32,7 @@ namespace uhd{ namespace usrp{ -class fx2_ctrl : boost::noncopyable, public uhd::i2c_iface{ +class fx2_ctrl : uhd::noncopyable, public uhd::i2c_iface{ public: typedef boost::shared_ptr<fx2_ctrl> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp index 1869191e3..446c37604 100644 --- a/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp @@ -11,10 +11,10 @@ #include <uhd/config.hpp> #include <uhd/types/wb_iface.hpp> #include <boost/shared_ptr.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> -class dma_fifo_core_3000 : boost::noncopyable +class dma_fifo_core_3000 : uhd::noncopyable { public: typedef boost::shared_ptr<dma_fifo_core_3000> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp index 0e0f706b8..76f9e0fb9 100644 --- a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp @@ -11,6 +11,7 @@ #include <uhd/config.hpp> #include <uhd/usrp/dboard_iface.hpp> #include <uhd/usrp/gpio_defs.hpp> +#include <uhd/utils/noncopyable.hpp> #include <uhdlib/usrp/gpio_defs.hpp> #include <uhd/types/wb_iface.hpp> #include <boost/shared_ptr.hpp> @@ -22,7 +23,7 @@ namespace uhd { namespace usrp { namespace gpio_atr { -class gpio_atr_3000 : boost::noncopyable { +class gpio_atr_3000 : uhd::noncopyable { public: typedef boost::shared_ptr<gpio_atr_3000> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp index d5dff890e..24c09c113 100644 --- a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp @@ -11,14 +11,13 @@ #include <uhd/config.hpp> #include <uhd/usrp/dboard_iface.hpp> #include <uhd/usrp/gpio_defs.hpp> -#include <boost/assign.hpp> -#include <stdint.h> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <uhd/types/wb_iface.hpp> #include <map> +#include <stdint.h> -class gpio_core_200 : boost::noncopyable{ +class gpio_core_200 : uhd::noncopyable{ public: typedef boost::shared_ptr<gpio_core_200> sptr; @@ -57,7 +56,7 @@ public: }; //! Simple wrapper for 32 bit write only -class gpio_core_200_32wo : boost::noncopyable{ +class gpio_core_200_32wo : uhd::noncopyable{ public: typedef boost::shared_ptr<gpio_core_200_32wo> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp b/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp index 6c4182544..266f3e44a 100644 --- a/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp +++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp @@ -10,11 +10,11 @@ #include <uhd/config.hpp> #include <uhd/types/serial.hpp> -#include <boost/utility.hpp> -#include <boost/shared_ptr.hpp> +#include <uhd/utils/noncopyable.hpp> #include <uhd/types/wb_iface.hpp> +#include <boost/shared_ptr.hpp> -class i2c_core_100_wb32 : boost::noncopyable, public uhd::i2c_iface{ +class i2c_core_100_wb32 : uhd::noncopyable, public uhd::i2c_iface{ public: typedef boost::shared_ptr<i2c_core_100_wb32> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp index 354244891..f6c47f4bd 100644 --- a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp @@ -10,11 +10,12 @@ #include <uhd/config.hpp> #include <uhd/types/serial.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/utility.hpp> #include <boost/shared_ptr.hpp> #include <uhd/types/wb_iface.hpp> -class i2c_core_200 : boost::noncopyable, public uhd::i2c_iface{ +class i2c_core_200 : uhd::noncopyable, public uhd::i2c_iface{ public: typedef boost::shared_ptr<i2c_core_200> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp index e9b6b98cf..ccf421c06 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp @@ -11,13 +11,13 @@ #include <uhd/config.hpp> #include <uhd/stream.hpp> #include <uhd/types/ranges.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <uhd/types/stream_cmd.hpp> #include <uhd/types/wb_iface.hpp> #include <string> -class rx_dsp_core_200 : boost::noncopyable{ +class rx_dsp_core_200 : uhd::noncopyable{ public: typedef boost::shared_ptr<rx_dsp_core_200> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp index e87fd4926..0494d09fc 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp @@ -15,11 +15,11 @@ #include <uhd/types/wb_iface.hpp> #include <uhd/property_tree.hpp> #include <uhd/usrp/fe_connection.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <string> -class rx_dsp_core_3000 : boost::noncopyable{ +class rx_dsp_core_3000 : uhd::noncopyable{ public: static const double DEFAULT_CORDIC_FREQ; static const double DEFAULT_DDS_FREQ; diff --git a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp index c4848bde2..bfba94b10 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp @@ -11,12 +11,12 @@ #include <uhd/config.hpp> #include <uhd/types/wb_iface.hpp> #include <uhd/property_tree.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <complex> #include <string> -class rx_frontend_core_200 : boost::noncopyable{ +class rx_frontend_core_200 : uhd::noncopyable{ public: static const std::complex<double> DEFAULT_DC_OFFSET_VALUE; static const bool DEFAULT_DC_OFFSET_ENABLE; diff --git a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp index e425e51a4..1492ba7ef 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp @@ -12,12 +12,12 @@ #include <uhd/types/wb_iface.hpp> #include <uhd/property_tree.hpp> #include <uhd/usrp/fe_connection.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <complex> #include <string> -class rx_frontend_core_3000 : boost::noncopyable{ +class rx_frontend_core_3000 : uhd::noncopyable{ public: static const std::complex<double> DEFAULT_DC_OFFSET_VALUE; static const bool DEFAULT_DC_OFFSET_ENABLE; diff --git a/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp index 919631300..7205e3b5f 100644 --- a/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp @@ -11,13 +11,13 @@ #include <uhd/config.hpp> #include <uhd/stream.hpp> #include <uhd/types/ranges.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <uhd/types/stream_cmd.hpp> #include <uhd/types/wb_iface.hpp> #include <string> -class rx_vita_core_3000 : boost::noncopyable +class rx_vita_core_3000 : uhd::noncopyable { public: typedef boost::shared_ptr<rx_vita_core_3000> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp index ea0507754..81ea05a37 100644 --- a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp @@ -10,11 +10,11 @@ #include <uhd/config.hpp> #include <uhd/types/serial.hpp> -#include <boost/utility.hpp> -#include <boost/shared_ptr.hpp> +#include <uhd/utils/noncopyable.hpp> #include <uhd/types/wb_iface.hpp> +#include <boost/shared_ptr.hpp> -class spi_core_3000 : boost::noncopyable, public uhd::spi_iface +class spi_core_3000 : uhd::noncopyable, public uhd::spi_iface { public: typedef boost::shared_ptr<spi_core_3000> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp index 23e0da922..883a83edb 100644 --- a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp @@ -10,13 +10,14 @@ #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> +#include <uhd/utils/noncopyable.hpp> +#include <uhd/types/wb_iface.hpp> #include <boost/utility.hpp> #include <boost/shared_ptr.hpp> -#include <uhd/types/wb_iface.hpp> #include <string> #include <vector> -class time64_core_200 : boost::noncopyable{ +class time64_core_200 : uhd::noncopyable{ public: typedef boost::shared_ptr<time64_core_200> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp index 4fa2ae657..1f3fa8129 100644 --- a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp @@ -10,11 +10,11 @@ #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <uhd/types/wb_iface.hpp> -class time_core_3000 : boost::noncopyable +class time_core_3000 : uhd::noncopyable { public: typedef boost::shared_ptr<time_core_3000> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp index 98e8b5225..6ddbf9fbd 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp @@ -11,11 +11,11 @@ #include <uhd/config.hpp> #include <uhd/stream.hpp> #include <uhd/types/ranges.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <uhd/types/wb_iface.hpp> -class tx_dsp_core_200 : boost::noncopyable{ +class tx_dsp_core_200 : uhd::noncopyable{ public: typedef boost::shared_ptr<tx_dsp_core_200> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp index 2976d8b4a..98fafd5f0 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp @@ -13,10 +13,10 @@ #include <uhd/types/ranges.hpp> #include <uhd/types/wb_iface.hpp> #include <uhd/property_tree.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -class tx_dsp_core_3000 : boost::noncopyable{ +class tx_dsp_core_3000 : uhd::noncopyable{ public: static const double DEFAULT_CORDIC_FREQ; static const double DEFAULT_DDS_FREQ; diff --git a/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp index eb86bf85d..0221007d1 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp @@ -11,12 +11,12 @@ #include <uhd/config.hpp> #include <uhd/types/wb_iface.hpp> #include <uhd/property_tree.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <complex> #include <string> -class tx_frontend_core_200 : boost::noncopyable{ +class tx_frontend_core_200 : uhd::noncopyable{ public: typedef boost::shared_ptr<tx_frontend_core_200> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp index 4d33bb0c2..57d27d6b3 100644 --- a/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp +++ b/host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp @@ -11,13 +11,13 @@ #include <uhd/config.hpp> #include <uhd/stream.hpp> #include <uhd/types/ranges.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> #include <uhd/types/stream_cmd.hpp> #include <uhd/types/wb_iface.hpp> #include <string> -class tx_vita_core_3000 : boost::noncopyable +class tx_vita_core_3000 : uhd::noncopyable { public: typedef boost::shared_ptr<tx_vita_core_3000> sptr; diff --git a/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp b/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp index 354b5e637..e466e6e44 100644 --- a/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp +++ b/host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp @@ -9,11 +9,12 @@ #define INCLUDED_LIBUHD_USRP_USER_SETTINGS_CORE_200_HPP #include <uhd/config.hpp> +#include <uhd/utils/noncopyable.hpp> +#include <uhd/types/wb_iface.hpp> #include <boost/utility.hpp> #include <boost/shared_ptr.hpp> -#include <uhd/types/wb_iface.hpp> -class user_settings_core_200 : boost::noncopyable{ +class user_settings_core_200 : uhd::noncopyable{ public: typedef boost::shared_ptr<user_settings_core_200> sptr; typedef std::pair<uint8_t, uint32_t> user_reg_t; diff --git a/host/lib/stream_python.hpp b/host/lib/stream_python.hpp index e07d120f1..0760edf1b 100644 --- a/host/lib/stream_python.hpp +++ b/host/lib/stream_python.hpp @@ -186,7 +186,7 @@ void export_stream() bp::class_< rx_streamer, boost::shared_ptr<rx_streamer>, - boost::noncopyable>("rx_streamer", "See: uhd::rx_streamer", bp::no_init) + uhd::noncopyable>("rx_streamer", "See: uhd::rx_streamer", bp::no_init) // Methods .def("recv" , &wrap_recv, overload_wrap_recv() ) @@ -198,7 +198,7 @@ void export_stream() bp::class_< tx_streamer, boost::shared_ptr<tx_streamer>, - boost::noncopyable>("tx_streamer", "See: uhd::tx_streamer", bp::no_init) + uhd::noncopyable>("tx_streamer", "See: uhd::tx_streamer", bp::no_init) // Methods .def("send" , &wrap_send, overload_wrap_send()) 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, 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; diff --git a/host/lib/usrp/b200/b200_iface.hpp b/host/lib/usrp/b200/b200_iface.hpp index 86307bc21..0e1e0e9ed 100644 --- a/host/lib/usrp/b200/b200_iface.hpp +++ b/host/lib/usrp/b200/b200_iface.hpp @@ -14,7 +14,7 @@ #include <uhdlib/usrp/common/ad9361_ctrl.hpp> #include <boost/assign/list_of.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <stdint.h> enum b200_product_t { @@ -76,7 +76,7 @@ static const uhd::dict<b200_product_t, std::string> B2XX_FPGA_FILE_NAME = boost: ; -class UHD_API b200_iface: boost::noncopyable, public virtual uhd::i2c_iface { +class UHD_API b200_iface: uhd::noncopyable, public virtual uhd::i2c_iface { public: typedef boost::shared_ptr<b200_iface> sptr; diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.h b/host/lib/usrp/common/ad9361_driver/ad9361_device.h index 2a81118ce..2da7526f0 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.h +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.h @@ -11,7 +11,7 @@ #include <ad9361_client.h> #include <uhd/types/filters.hpp> #include <uhd/types/sensors.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <complex> #include <vector> #include <map> @@ -21,7 +21,7 @@ namespace uhd { namespace usrp { -class ad9361_device_t : public boost::noncopyable +class ad9361_device_t : public uhd::noncopyable { public: enum direction_t { RX, TX }; diff --git a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.hpp b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.hpp index a96abf879..7638d4509 100644 --- a/host/lib/usrp/dboard/twinrx/twinrx_ctrl.hpp +++ b/host/lib/usrp/dboard/twinrx/twinrx_ctrl.hpp @@ -10,11 +10,11 @@ #include "twinrx_io.hpp" #include <uhd/types/wb_iface.hpp> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> namespace uhd { namespace usrp { namespace dboard { namespace twinrx { -class twinrx_ctrl : public boost::noncopyable { +class twinrx_ctrl : public uhd::noncopyable { public: typedef std::shared_ptr<twinrx_ctrl> sptr; diff --git a/host/lib/usrp/dboard_iface_python.hpp b/host/lib/usrp/dboard_iface_python.hpp index df86fdcc8..f43490e7d 100644 --- a/host/lib/usrp/dboard_iface_python.hpp +++ b/host/lib/usrp/dboard_iface_python.hpp @@ -63,7 +63,7 @@ void export_dboard_iface() bp::class_< dboard_iface, boost::shared_ptr<dboard_iface>, - boost::noncopyable>("dboard_iface", bp::no_init) + uhd::noncopyable>("dboard_iface", bp::no_init) // Methods .def("get_special_props", &dboard_iface::get_special_props) diff --git a/host/lib/usrp/e300/e300_eeprom_manager.hpp b/host/lib/usrp/e300/e300_eeprom_manager.hpp index 76cb91dd1..ee4497211 100644 --- a/host/lib/usrp/e300/e300_eeprom_manager.hpp +++ b/host/lib/usrp/e300/e300_eeprom_manager.hpp @@ -31,7 +31,7 @@ static const uint16_t E310_MB_MAP_MINOR = 0x0000; static const uint16_t E310_DB_MAP_MAJOR = 0x0001; static const uint16_t E310_DB_MAP_MINOR = 0x0000; -class e300_eeprom_manager : boost::noncopyable +class e300_eeprom_manager : uhd::noncopyable { public: typedef boost::shared_ptr<e300_eeprom_manager> sptr; diff --git a/host/lib/usrp/e300/e300_global_regs.hpp b/host/lib/usrp/e300/e300_global_regs.hpp index faf99b066..e7d668d78 100644 --- a/host/lib/usrp/e300/e300_global_regs.hpp +++ b/host/lib/usrp/e300/e300_global_regs.hpp @@ -21,7 +21,7 @@ struct global_regs_transaction_t { uint32_t pad; }; -class global_regs : boost::noncopyable, public virtual uhd::wb_iface +class global_regs : uhd::noncopyable, public virtual uhd::wb_iface { public: typedef boost::shared_ptr<global_regs> sptr; diff --git a/host/lib/usrp/e300/e300_i2c.hpp b/host/lib/usrp/e300/e300_i2c.hpp index b2d32347c..1606d2146 100644 --- a/host/lib/usrp/e300/e300_i2c.hpp +++ b/host/lib/usrp/e300/e300_i2c.hpp @@ -8,7 +8,7 @@ #ifndef INCLUDED_E300_I2C_HPP #define INCLUDED_E300_I2C_HPP -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <stdint.h> #include <boost/shared_ptr.hpp> @@ -24,7 +24,7 @@ struct i2c_transaction_t { uint8_t type; }; -class i2c : public boost::noncopyable +class i2c : public uhd::noncopyable { public: typedef boost::shared_ptr<i2c> sptr; diff --git a/host/lib/usrp/e300/e300_network.hpp b/host/lib/usrp/e300/e300_network.hpp index 77c331d6e..caa25b0ad 100644 --- a/host/lib/usrp/e300/e300_network.hpp +++ b/host/lib/usrp/e300/e300_network.hpp @@ -9,7 +9,7 @@ #define INCLUDED_E300_NETWORK_HPP #include <string> -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <uhd/device.hpp> @@ -19,7 +19,7 @@ static const std::string E300_FPGA_FILE_NAME = "usrp_e300_fpga.bit"; namespace uhd { namespace usrp { namespace e300 { -class UHD_API network_server : boost::noncopyable +class UHD_API network_server : uhd::noncopyable { public: typedef boost::shared_ptr<network_server> sptr; diff --git a/host/lib/usrp/e300/e300_sensor_manager.hpp b/host/lib/usrp/e300/e300_sensor_manager.hpp index 785db93bf..8ed09b1eb 100644 --- a/host/lib/usrp/e300/e300_sensor_manager.hpp +++ b/host/lib/usrp/e300/e300_sensor_manager.hpp @@ -5,7 +5,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include <boost/noncopyable.hpp> +#include <uhd/utils/noncopyable.hpp> #include <stdint.h> #include <uhd/transport/zero_copy.hpp> @@ -31,7 +31,7 @@ struct sensor_transaction_t { enum sensor {ZYNQ_TEMP=0, REF_LOCK=4}; -class e300_sensor_manager : boost::noncopyable +class e300_sensor_manager : uhd::noncopyable { public: typedef boost::shared_ptr<e300_sensor_manager> sptr; diff --git a/host/lib/usrp/multi_usrp_python.hpp b/host/lib/usrp/multi_usrp_python.hpp index 75a64ceeb..6dc14f083 100644 --- a/host/lib/usrp/multi_usrp_python.hpp +++ b/host/lib/usrp/multi_usrp_python.hpp @@ -346,7 +346,7 @@ void export_multi_usrp() bp::class_< multi_usrp, boost::shared_ptr<multi_usrp>, - boost::noncopyable>("multi_usrp", bp::no_init) + uhd::noncopyable>("multi_usrp", bp::no_init) .def("__init__", bp::make_constructor(&multi_usrp::make)) diff --git a/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp b/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp index af9ffc307..f0ed316cf 100644 --- a/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp +++ b/host/lib/usrp/n230/n230_clk_pps_ctrl.hpp @@ -14,12 +14,12 @@ #include <uhdlib/usrp/cores/time_core_3000.hpp> #include <uhdlib/usrp/common/ad9361_ctrl.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <vector> namespace uhd { namespace usrp { namespace n230 { -class n230_clk_pps_ctrl : boost::noncopyable +class n230_clk_pps_ctrl : uhd::noncopyable { public: typedef boost::shared_ptr<n230_clk_pps_ctrl> sptr; diff --git a/host/lib/usrp/n230/n230_cores.hpp b/host/lib/usrp/n230/n230_cores.hpp index 2768ada41..b37a6c1ef 100644 --- a/host/lib/usrp/n230/n230_cores.hpp +++ b/host/lib/usrp/n230/n230_cores.hpp @@ -14,7 +14,7 @@ namespace uhd { namespace usrp { namespace n230 { -class n230_core_spi_core : boost::noncopyable, public uhd::spi_iface { +class n230_core_spi_core : uhd::noncopyable, public uhd::spi_iface { public: typedef boost::shared_ptr<n230_core_spi_core> sptr; diff --git a/host/lib/usrp/n230/n230_eeprom_manager.hpp b/host/lib/usrp/n230/n230_eeprom_manager.hpp index cc51f3747..72735916f 100644 --- a/host/lib/usrp/n230/n230_eeprom_manager.hpp +++ b/host/lib/usrp/n230/n230_eeprom_manager.hpp @@ -16,7 +16,7 @@ namespace uhd { namespace usrp { namespace n230 { -class n230_eeprom_manager : boost::noncopyable +class n230_eeprom_manager : uhd::noncopyable { public: n230_eeprom_manager(const std::string& addr); diff --git a/host/lib/usrp/n230/n230_frontend_ctrl.hpp b/host/lib/usrp/n230/n230_frontend_ctrl.hpp index 842814213..d8b376831 100644 --- a/host/lib/usrp/n230/n230_frontend_ctrl.hpp +++ b/host/lib/usrp/n230/n230_frontend_ctrl.hpp @@ -14,7 +14,7 @@ #include <uhdlib/usrp/common/ad9361_ctrl.hpp> #include <uhd/types/sensors.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> #include <vector> namespace uhd { namespace usrp { namespace n230 { @@ -28,7 +28,7 @@ enum self_test_mode_t { }; -class n230_frontend_ctrl : boost::noncopyable +class n230_frontend_ctrl : uhd::noncopyable { public: typedef boost::shared_ptr<n230_frontend_ctrl> sptr; diff --git a/host/lib/usrp/n230/n230_resource_manager.hpp b/host/lib/usrp/n230/n230_resource_manager.hpp index 4b4065e8f..ed3bbcb0c 100644 --- a/host/lib/usrp/n230/n230_resource_manager.hpp +++ b/host/lib/usrp/n230/n230_resource_manager.hpp @@ -71,7 +71,7 @@ enum n230_data_dir_t { }; //Radio resources -class radio_resource_t : public boost::noncopyable { +class radio_resource_t : public uhd::noncopyable { public: radio_ctrl_core_3000::sptr ctrl; gpio_atr::gpio_atr_3000::sptr gpio_atr; @@ -83,7 +83,7 @@ public: user_settings_core_3000::sptr user_settings; }; -class n230_resource_manager : public boost::noncopyable +class n230_resource_manager : public uhd::noncopyable { public: //Methods n230_resource_manager(const std::vector<std::string> ip_addrs, const bool safe_mode); diff --git a/host/lib/usrp/n230/n230_stream_manager.hpp b/host/lib/usrp/n230/n230_stream_manager.hpp index 6ec219f0b..fcb00bd51 100644 --- a/host/lib/usrp/n230/n230_stream_manager.hpp +++ b/host/lib/usrp/n230/n230_stream_manager.hpp @@ -25,7 +25,7 @@ namespace uhd { namespace usrp { namespace n230 { -class n230_stream_manager : public boost::noncopyable +class n230_stream_manager : public uhd::noncopyable { public: //Methods n230_stream_manager( diff --git a/host/lib/usrp/n230/n230_uart.hpp b/host/lib/usrp/n230/n230_uart.hpp index 1a90ca928..b1b60a21d 100644 --- a/host/lib/usrp/n230/n230_uart.hpp +++ b/host/lib/usrp/n230/n230_uart.hpp @@ -12,10 +12,10 @@ #include <uhd/types/serial.hpp> //uart iface #include <uhd/utils/tasks.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> +#include <uhd/utils/noncopyable.hpp> namespace uhd { namespace usrp { namespace n230 { -class n230_uart: boost::noncopyable, public uhd::uart_iface +class n230_uart: uhd::noncopyable, public uhd::uart_iface { public: typedef boost::shared_ptr<n230_uart> sptr; 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; 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; diff --git a/host/lib/usrp/x300/x300_adc_ctrl.hpp b/host/lib/usrp/x300/x300_adc_ctrl.hpp index 106d79eed..354b8db49 100644 --- a/host/lib/usrp/x300/x300_adc_ctrl.hpp +++ b/host/lib/usrp/x300/x300_adc_ctrl.hpp @@ -9,10 +9,10 @@ #define INCLUDED_X300_ADC_CTRL_HPP #include <uhd/types/serial.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> -class x300_adc_ctrl : boost::noncopyable +class x300_adc_ctrl : uhd::noncopyable { public: typedef boost::shared_ptr<x300_adc_ctrl> sptr; diff --git a/host/lib/usrp/x300/x300_clock_ctrl.hpp b/host/lib/usrp/x300/x300_clock_ctrl.hpp index 609464ca0..25c2dd33f 100644 --- a/host/lib/usrp/x300/x300_clock_ctrl.hpp +++ b/host/lib/usrp/x300/x300_clock_ctrl.hpp @@ -9,8 +9,8 @@ #define INCLUDED_X300_CLOCK_CTRL_HPP #include <uhd/types/serial.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> enum x300_clock_which_t { @@ -25,7 +25,7 @@ enum x300_clock_which_t { X300_CLOCK_WHICH_FPGA, }; -class x300_clock_ctrl : boost::noncopyable +class x300_clock_ctrl : uhd::noncopyable { public: typedef boost::shared_ptr<x300_clock_ctrl> sptr; diff --git a/host/lib/usrp/x300/x300_dac_ctrl.hpp b/host/lib/usrp/x300/x300_dac_ctrl.hpp index 74dba0cb4..d73a03d63 100644 --- a/host/lib/usrp/x300/x300_dac_ctrl.hpp +++ b/host/lib/usrp/x300/x300_dac_ctrl.hpp @@ -9,10 +9,10 @@ #define INCLUDED_X300_DAC_CTRL_HPP #include <uhd/types/serial.hpp> +#include <uhd/utils/noncopyable.hpp> #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> -class x300_dac_ctrl : boost::noncopyable +class x300_dac_ctrl : uhd::noncopyable { public: typedef boost::shared_ptr<x300_dac_ctrl> sptr; |