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/include/uhdlib/usrp/common/ad9361_ctrl.hpp           | 2 +-
 host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp              | 4 ++--
 host/lib/include/uhdlib/usrp/cores/dma_fifo_core_3000.hpp     | 4 ++--
 host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp          | 3 ++-
 host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp          | 9 ++++-----
 host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp      | 6 +++---
 host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp           | 3 ++-
 host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp        | 4 ++--
 host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp       | 4 ++--
 host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp   | 4 ++--
 host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp  | 4 ++--
 host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp      | 4 ++--
 host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp          | 6 +++---
 host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp        | 5 +++--
 host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp         | 4 ++--
 host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp        | 4 ++--
 host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp       | 4 ++--
 host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp   | 4 ++--
 host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp      | 4 ++--
 host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp | 5 +++--
 20 files changed, 45 insertions(+), 42 deletions(-)

(limited to 'host/lib/include/uhdlib/usrp')

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