aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/e300
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-01-29 17:21:17 +0100
committerMartin Braun <martin.braun@ettus.com>2019-02-15 11:12:54 -0800
commit52138314a4daa8140b4dabca5ca4a9ffc6a8ff84 (patch)
tree6f3f81880da4e6a0efa05908662ad6d4fdefd239 /host/lib/usrp/e300
parent5758533839a411906f70e29975a9e9ad2926fe89 (diff)
downloaduhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.tar.gz
uhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.tar.bz2
uhd-52138314a4daa8140b4dabca5ca4a9ffc6a8ff84.zip
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.
Diffstat (limited to 'host/lib/usrp/e300')
-rw-r--r--host/lib/usrp/e300/e300_eeprom_manager.hpp2
-rw-r--r--host/lib/usrp/e300/e300_global_regs.hpp2
-rw-r--r--host/lib/usrp/e300/e300_i2c.hpp4
-rw-r--r--host/lib/usrp/e300/e300_network.hpp4
-rw-r--r--host/lib/usrp/e300/e300_sensor_manager.hpp4
5 files changed, 8 insertions, 8 deletions
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;