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/lib/usrp/b100/clock_ctrl.hpp                  | 4 ++--
 host/lib/usrp/b100/codec_ctrl.hpp                  | 4 ++--
 host/lib/usrp/b200/b200_iface.hpp                  | 4 ++--
 host/lib/usrp/common/ad9361_driver/ad9361_device.h | 4 ++--
 host/lib/usrp/dboard/twinrx/twinrx_ctrl.hpp        | 4 ++--
 host/lib/usrp/dboard_iface_python.hpp              | 2 +-
 host/lib/usrp/e300/e300_eeprom_manager.hpp         | 2 +-
 host/lib/usrp/e300/e300_global_regs.hpp            | 2 +-
 host/lib/usrp/e300/e300_i2c.hpp                    | 4 ++--
 host/lib/usrp/e300/e300_network.hpp                | 4 ++--
 host/lib/usrp/e300/e300_sensor_manager.hpp         | 4 ++--
 host/lib/usrp/multi_usrp_python.hpp                | 2 +-
 host/lib/usrp/n230/n230_clk_pps_ctrl.hpp           | 4 ++--
 host/lib/usrp/n230/n230_cores.hpp                  | 2 +-
 host/lib/usrp/n230/n230_eeprom_manager.hpp         | 2 +-
 host/lib/usrp/n230/n230_frontend_ctrl.hpp          | 4 ++--
 host/lib/usrp/n230/n230_resource_manager.hpp       | 4 ++--
 host/lib/usrp/n230/n230_stream_manager.hpp         | 2 +-
 host/lib/usrp/n230/n230_uart.hpp                   | 4 ++--
 host/lib/usrp/usrp1/codec_ctrl.hpp                 | 4 ++--
 host/lib/usrp/usrp1/soft_time_ctrl.hpp             | 4 ++--
 host/lib/usrp/usrp1/usrp1_iface.hpp                | 4 ++--
 host/lib/usrp/usrp2/clock_ctrl.hpp                 | 4 ++--
 host/lib/usrp/usrp2/codec_ctrl.hpp                 | 4 ++--
 host/lib/usrp/x300/x300_adc_ctrl.hpp               | 4 ++--
 host/lib/usrp/x300/x300_clock_ctrl.hpp             | 4 ++--
 host/lib/usrp/x300/x300_dac_ctrl.hpp               | 4 ++--
 27 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'host/lib/usrp')

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