From 52138314a4daa8140b4dabca5ca4a9ffc6a8ff84 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 29 Jan 2019 17:21:17 +0100
Subject: 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.
---
 host/include/uhd/device.hpp                             | 4 ++--
 host/include/uhd/image_loader.hpp                       | 4 ++--
 host/include/uhd/property_tree.hpp                      | 5 +++--
 host/include/uhd/rfnoc/graph.hpp                        | 4 ++--
 host/include/uhd/rfnoc/node_ctrl_base.hpp               | 3 ++-
 host/include/uhd/stream.hpp                             | 5 +++--
 host/include/uhd/transport/bounded_buffer.ipp           | 3 ++-
 host/include/uhd/transport/buffer_pool.hpp              | 4 ++--
 host/include/uhd/transport/muxed_zero_copy_if.hpp       | 4 ++--
 host/include/uhd/transport/nirio/nirio_fifo.h           | 4 ++--
 host/include/uhd/transport/nirio/niriok_proxy.h         | 6 +++---
 host/include/uhd/transport/nirio/niriok_proxy_impl_v1.h | 2 +-
 host/include/uhd/transport/nirio/niriok_proxy_impl_v2.h | 2 +-
 host/include/uhd/transport/nirio/niusrprio_session.h    | 4 ++--
 host/include/uhd/transport/nirio/rpc/rpc_client.hpp     | 3 ++-
 host/include/uhd/transport/udp_simple.hpp               | 4 ++--
 host/include/uhd/transport/usb_control.hpp              | 4 +++-
 host/include/uhd/transport/usb_device_handle.hpp        | 6 +++---
 host/include/uhd/transport/zero_copy.hpp                | 3 ++-
 host/include/uhd/usrp/dboard_base.hpp                   | 4 ++--
 host/include/uhd/usrp/dboard_manager.hpp                | 4 ++--
 host/include/uhd/usrp/gps_ctrl.hpp                      | 5 ++---
 host/include/uhd/usrp/multi_usrp.hpp                    | 4 ++--
 host/include/uhd/usrp_clock/multi_usrp_clock.hpp        | 2 +-
 host/include/uhd/utils/gain_group.hpp                   | 4 ++--
 host/include/uhd/utils/msg_task.hpp                     | 4 ++--
 host/include/uhd/utils/soft_register.hpp                | 8 ++++----
 host/include/uhd/utils/tasks.hpp                        | 3 ++-
 28 files changed, 60 insertions(+), 52 deletions(-)

(limited to 'host/include')

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;
-- 
cgit v1.2.3