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/usrp1/codec_ctrl.hpp | 4 ++--
host/lib/usrp/usrp1/soft_time_ctrl.hpp | 4 ++--
host/lib/usrp/usrp1/usrp1_iface.hpp | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'host/lib/usrp/usrp1')
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;
--
cgit v1.2.3