aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/include/uhdlib/usrp
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2019-09-28 11:18:57 +0200
committerMartin Braun <martin.braun@ettus.com>2019-11-26 12:21:32 -0800
commit1fe98e8701dd0b790b172762c3629db32956d1fc (patch)
tree7719e69633f9639f1dcdcf00ebf7db6c4cd6dda2 /host/lib/include/uhdlib/usrp
parent8541a9b397fb53034c37dd00289aa96def24d410 (diff)
downloaduhd-1fe98e8701dd0b790b172762c3629db32956d1fc.tar.gz
uhd-1fe98e8701dd0b790b172762c3629db32956d1fc.tar.bz2
uhd-1fe98e8701dd0b790b172762c3629db32956d1fc.zip
uhd: Replace usage of boost smart pointers with C++11 counterparts
This removes the following Boost constructs: - boost::shared_ptr, boost::weak_ptr - boost::enable_shared_from_this - boost::static_pointer_cast, boost::dynamic_pointer_cast The appropriate includes were also removed. All C++11 versions of these require #include <memory>. Note that the stdlib and Boost versions have the exact same syntax, they only differ in the namespace (boost vs. std). The modifications were all done using sed, with the exception of boost::scoped_ptr, which was replaced by std::unique_ptr. References to boost::smart_ptr were also removed. boost::intrusive_ptr is not removed in this commit, since it does not have a 1:1 mapping to a C++11 construct.
Diffstat (limited to 'host/lib/include/uhdlib/usrp')
-rw-r--r--host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/common/adf435x.hpp2
-rw-r--r--host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/common/max287x.hpp2
-rw-r--r--host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp6
-rw-r--r--host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp6
-rw-r--r--host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp6
-rw-r--r--host/lib/include/uhdlib/usrp/cores/i2c_core_100_wb32.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/rx_dsp_core_200.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/rx_dsp_core_3000.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/rx_frontend_core_200.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/rx_frontend_core_3000.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/rx_vita_core_3000.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/tx_dsp_core_200.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/tx_dsp_core_3000.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/tx_frontend_core_200.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/tx_vita_core_3000.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/user_settings_core_200.hpp4
-rw-r--r--host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp2
26 files changed, 52 insertions, 52 deletions
diff --git a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
index 99d74d80f..955da7c62 100644
--- a/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
+++ b/host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp
@@ -13,7 +13,7 @@
#include <uhd/types/serial.hpp>
#include <uhd/types/sensors.hpp>
#include <uhd/exception.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <ad9361_device.h>
#include <string>
#include <complex>
@@ -40,7 +40,7 @@ namespace uhd { namespace usrp {
class ad9361_ctrl : public uhd::noncopyable
{
public:
- typedef boost::shared_ptr<ad9361_ctrl> sptr;
+ typedef std::shared_ptr<ad9361_ctrl> sptr;
virtual ~ad9361_ctrl(void) {}
diff --git a/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp b/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp
index 7abbe69ed..2d21d55e7 100644
--- a/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp
+++ b/host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp
@@ -14,7 +14,7 @@
#include <uhd/types/direction.hpp>
#include <uhdlib/usrp/common/ad9361_ctrl.hpp>
#include <boost/format.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <stdint.h>
#include <functional>
@@ -29,7 +29,7 @@ namespace uhd { namespace usrp {
class ad936x_manager
{
public:
- typedef boost::shared_ptr<ad936x_manager> sptr;
+ typedef std::shared_ptr<ad936x_manager> sptr;
static const double DEFAULT_GAIN;
static const double DEFAULT_BANDWIDTH;
diff --git a/host/lib/include/uhdlib/usrp/common/adf435x.hpp b/host/lib/include/uhdlib/usrp/common/adf435x.hpp
index 056290451..6f654bcbb 100644
--- a/host/lib/include/uhdlib/usrp/common/adf435x.hpp
+++ b/host/lib/include/uhdlib/usrp/common/adf435x.hpp
@@ -23,7 +23,7 @@
class adf435x_iface
{
public:
- typedef boost::shared_ptr<adf435x_iface> sptr;
+ typedef std::shared_ptr<adf435x_iface> sptr;
typedef boost::function<void(std::vector<uint32_t>)> write_fn_t;
static sptr make_adf4350(write_fn_t write);
diff --git a/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp b/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp
index 6aafa885b..8579787f4 100644
--- a/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp
+++ b/host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp
@@ -11,7 +11,7 @@
#include <uhd/transport/usb_control.hpp>
#include <uhd/types/serial.hpp> //i2c iface
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#define FL_BEGIN 0
#define FL_END 2
@@ -34,7 +34,7 @@ namespace uhd{ namespace usrp{
class fx2_ctrl : uhd::noncopyable, public uhd::i2c_iface{
public:
- typedef boost::shared_ptr<fx2_ctrl> sptr;
+ typedef std::shared_ptr<fx2_ctrl> sptr;
/*!
* Make a usrp control object from a control transport
diff --git a/host/lib/include/uhdlib/usrp/common/max287x.hpp b/host/lib/include/uhdlib/usrp/common/max287x.hpp
index 92bc31630..51c22c5d8 100644
--- a/host/lib/include/uhdlib/usrp/common/max287x.hpp
+++ b/host/lib/include/uhdlib/usrp/common/max287x.hpp
@@ -30,7 +30,7 @@
class max287x_iface
{
public:
- typedef boost::shared_ptr<max287x_iface> sptr;
+ typedef std::shared_ptr<max287x_iface> sptr;
typedef boost::function<void(std::vector<uint32_t>)> write_fn;
diff --git a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp
index d158a919e..c61e0ba99 100644
--- a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp
+++ b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp
@@ -10,14 +10,14 @@
#include <uhd/config.hpp>
#include <uhd/transport/zero_copy.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <stdint.h>
namespace uhd{ namespace usrp{
class recv_packet_demuxer{
public:
- typedef boost::shared_ptr<recv_packet_demuxer> sptr;
+ typedef std::shared_ptr<recv_packet_demuxer> sptr;
virtual ~recv_packet_demuxer(void) = 0;
diff --git a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
index 54ae10908..bb5b070c5 100644
--- a/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp
@@ -14,7 +14,7 @@
#include <uhd/types/time_spec.hpp>
#include <uhd/utils/byteswap.hpp>
#include <boost/thread.hpp>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
#include <queue>
#include <map>
#include <chrono>
@@ -22,9 +22,9 @@
namespace uhd{ namespace usrp{
- struct recv_packet_demuxer_3000 : boost::enable_shared_from_this<recv_packet_demuxer_3000>
+ struct recv_packet_demuxer_3000 : std::enable_shared_from_this<recv_packet_demuxer_3000>
{
- typedef boost::shared_ptr<recv_packet_demuxer_3000> sptr;
+ typedef std::shared_ptr<recv_packet_demuxer_3000> sptr;
static sptr make(transport::zero_copy_if::sptr xport)
{
return sptr(new recv_packet_demuxer_3000(xport));
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 2ab0cf4cf..ad7d4b588 100644
--- a/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/gpio_atr_3000.hpp
@@ -14,14 +14,14 @@
#include <uhd/usrp/gpio_defs.hpp>
#include <uhd/utils/noncopyable.hpp>
#include <uhdlib/usrp/gpio_defs.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace uhd { namespace usrp { namespace gpio_atr {
class gpio_atr_3000 : uhd::noncopyable
{
public:
- typedef boost::shared_ptr<gpio_atr_3000> sptr;
+ typedef std::shared_ptr<gpio_atr_3000> sptr;
static const uint32_t MASK_SET_ALL = 0xFFFFFFFF;
@@ -118,7 +118,7 @@ public:
class db_gpio_atr_3000
{
public:
- typedef boost::shared_ptr<db_gpio_atr_3000> sptr;
+ typedef std::shared_ptr<db_gpio_atr_3000> sptr;
typedef uhd::usrp::dboard_iface::unit_t db_unit_t;
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 24c09c113..d6f104be1 100644
--- a/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/gpio_core_200.hpp
@@ -12,14 +12,14 @@
#include <uhd/usrp/dboard_iface.hpp>
#include <uhd/usrp/gpio_defs.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <uhd/types/wb_iface.hpp>
#include <map>
#include <stdint.h>
class gpio_core_200 : uhd::noncopyable{
public:
- typedef boost::shared_ptr<gpio_core_200> sptr;
+ typedef std::shared_ptr<gpio_core_200> sptr;
typedef uhd::usrp::dboard_iface::unit_t unit_t;
typedef uhd::usrp::dboard_iface::atr_reg_t atr_reg_t;
@@ -58,7 +58,7 @@ public:
//! Simple wrapper for 32 bit write only
class gpio_core_200_32wo : uhd::noncopyable{
public:
- typedef boost::shared_ptr<gpio_core_200_32wo> sptr;
+ typedef std::shared_ptr<gpio_core_200_32wo> sptr;
typedef uhd::usrp::dboard_iface::atr_reg_t atr_reg_t;
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 266f3e44a..42e57ca16 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
@@ -12,11 +12,11 @@
#include <uhd/types/serial.hpp>
#include <uhd/utils/noncopyable.hpp>
#include <uhd/types/wb_iface.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class i2c_core_100_wb32 : uhd::noncopyable, public uhd::i2c_iface{
public:
- typedef boost::shared_ptr<i2c_core_100_wb32> sptr;
+ typedef std::shared_ptr<i2c_core_100_wb32> sptr;
virtual ~i2c_core_100_wb32(void) = 0;
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 f6c47f4bd..6d987b68a 100644
--- a/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/i2c_core_200.hpp
@@ -12,12 +12,12 @@
#include <uhd/types/serial.hpp>
#include <uhd/utils/noncopyable.hpp>
#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <uhd/types/wb_iface.hpp>
class i2c_core_200 : uhd::noncopyable, public uhd::i2c_iface{
public:
- typedef boost::shared_ptr<i2c_core_200> sptr;
+ typedef std::shared_ptr<i2c_core_200> sptr;
virtual ~i2c_core_200(void) = 0;
diff --git a/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp
index f7be7ef91..427a72586 100644
--- a/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/radio_ctrl_core_3000.hpp
@@ -12,7 +12,7 @@
#include <uhd/types/time_spec.hpp>
#include <uhd/transport/zero_copy.hpp>
#include <uhd/types/wb_iface.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/utility.hpp>
#include <string>
@@ -22,7 +22,7 @@
class radio_ctrl_core_3000 : public uhd::timed_wb_iface
{
public:
- typedef boost::shared_ptr<radio_ctrl_core_3000> sptr;
+ typedef std::shared_ptr<radio_ctrl_core_3000> sptr;
virtual ~radio_ctrl_core_3000(void) = 0;
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 ccf421c06..240838495 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
@@ -12,14 +12,14 @@
#include <uhd/stream.hpp>
#include <uhd/types/ranges.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <uhd/types/stream_cmd.hpp>
#include <uhd/types/wb_iface.hpp>
#include <string>
class rx_dsp_core_200 : uhd::noncopyable{
public:
- typedef boost::shared_ptr<rx_dsp_core_200> sptr;
+ typedef std::shared_ptr<rx_dsp_core_200> sptr;
virtual ~rx_dsp_core_200(void) = 0;
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 8dbeab34f..f89d78191 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
@@ -16,7 +16,7 @@
#include <uhd/types/wb_iface.hpp>
#include <uhd/usrp/fe_connection.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <string>
class rx_dsp_core_3000 : uhd::noncopyable
@@ -26,7 +26,7 @@ public:
static const double DEFAULT_DDS_FREQ;
static const double DEFAULT_RATE;
- typedef boost::shared_ptr<rx_dsp_core_3000> sptr;
+ typedef std::shared_ptr<rx_dsp_core_3000> sptr;
virtual ~rx_dsp_core_3000(void) = 0;
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 bfba94b10..6a91f83da 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
@@ -12,7 +12,7 @@
#include <uhd/types/wb_iface.hpp>
#include <uhd/property_tree.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <complex>
#include <string>
@@ -22,7 +22,7 @@ public:
static const bool DEFAULT_DC_OFFSET_ENABLE;
static const std::complex<double> DEFAULT_IQ_BALANCE_VALUE;
- typedef boost::shared_ptr<rx_frontend_core_200> sptr;
+ typedef std::shared_ptr<rx_frontend_core_200> sptr;
virtual ~rx_frontend_core_200(void) = 0;
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 2d20c63fa..b1dfd307e 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
@@ -13,7 +13,7 @@
#include <uhd/types/wb_iface.hpp>
#include <uhd/usrp/fe_connection.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <complex>
#include <string>
@@ -24,7 +24,7 @@ public:
static const bool DEFAULT_DC_OFFSET_ENABLE;
static const std::complex<double> DEFAULT_IQ_BALANCE_VALUE;
- typedef boost::shared_ptr<rx_frontend_core_3000> sptr;
+ typedef std::shared_ptr<rx_frontend_core_3000> sptr;
virtual ~rx_frontend_core_3000(void) = 0;
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 7205e3b5f..615ca2319 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
@@ -12,7 +12,7 @@
#include <uhd/stream.hpp>
#include <uhd/types/ranges.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <uhd/types/stream_cmd.hpp>
#include <uhd/types/wb_iface.hpp>
#include <string>
@@ -20,7 +20,7 @@
class rx_vita_core_3000 : uhd::noncopyable
{
public:
- typedef boost::shared_ptr<rx_vita_core_3000> sptr;
+ typedef std::shared_ptr<rx_vita_core_3000> sptr;
virtual ~rx_vita_core_3000(void) = 0;
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 36486b5a1..4d08071f7 100644
--- a/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/spi_core_3000.hpp
@@ -12,14 +12,14 @@
#include <uhd/types/serial.hpp>
#include <uhd/utils/noncopyable.hpp>
#include <uhd/types/wb_iface.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <memory>
#include <functional>
class spi_core_3000 : uhd::noncopyable, public uhd::spi_iface
{
public:
- using sptr = boost::shared_ptr<spi_core_3000>;
+ using sptr = std::shared_ptr<spi_core_3000>;
using poke32_fn_t = std::function<void(uint32_t, uint32_t)>;
using peek32_fn_t = std::function<uint32_t(uint32_t)>;
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 883a83edb..4001d7d4d 100644
--- a/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/time64_core_200.hpp
@@ -13,13 +13,13 @@
#include <uhd/utils/noncopyable.hpp>
#include <uhd/types/wb_iface.hpp>
#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <string>
#include <vector>
class time64_core_200 : uhd::noncopyable{
public:
- typedef boost::shared_ptr<time64_core_200> sptr;
+ typedef std::shared_ptr<time64_core_200> sptr;
struct readback_bases_type{
size_t rb_hi_now, rb_lo_now;
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 1f3fa8129..8031ed130 100644
--- a/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/time_core_3000.hpp
@@ -11,13 +11,13 @@
#include <uhd/config.hpp>
#include <uhd/types/time_spec.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <uhd/types/wb_iface.hpp>
class time_core_3000 : uhd::noncopyable
{
public:
- typedef boost::shared_ptr<time_core_3000> sptr;
+ typedef std::shared_ptr<time_core_3000> sptr;
struct readback_bases_type
{
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 6ddbf9fbd..86a704c66 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
@@ -12,12 +12,12 @@
#include <uhd/stream.hpp>
#include <uhd/types/ranges.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <uhd/types/wb_iface.hpp>
class tx_dsp_core_200 : uhd::noncopyable{
public:
- typedef boost::shared_ptr<tx_dsp_core_200> sptr;
+ typedef std::shared_ptr<tx_dsp_core_200> sptr;
virtual ~tx_dsp_core_200(void) = 0;
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 c7cf07b6a..5dbded392 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
@@ -14,7 +14,7 @@
#include <uhd/types/ranges.hpp>
#include <uhd/types/wb_iface.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class tx_dsp_core_3000 : uhd::noncopyable
{
@@ -23,7 +23,7 @@ public:
static const double DEFAULT_DDS_FREQ;
static const double DEFAULT_RATE;
- typedef boost::shared_ptr<tx_dsp_core_3000> sptr;
+ typedef std::shared_ptr<tx_dsp_core_3000> sptr;
virtual ~tx_dsp_core_3000(void) = 0;
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 ae071c715..8a7178bb4 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
@@ -12,13 +12,13 @@
#include <uhd/types/wb_iface.hpp>
#include <uhd/property_tree.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <complex>
#include <string>
class tx_frontend_core_200 : uhd::noncopyable{
public:
- typedef boost::shared_ptr<tx_frontend_core_200> sptr;
+ typedef std::shared_ptr<tx_frontend_core_200> sptr;
static const std::complex<double> DEFAULT_DC_OFFSET_VALUE;
static const std::complex<double> DEFAULT_IQ_BALANCE_VALUE;
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 57d27d6b3..9d03549de 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
@@ -12,7 +12,7 @@
#include <uhd/stream.hpp>
#include <uhd/types/ranges.hpp>
#include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <uhd/types/stream_cmd.hpp>
#include <uhd/types/wb_iface.hpp>
#include <string>
@@ -20,7 +20,7 @@
class tx_vita_core_3000 : uhd::noncopyable
{
public:
- typedef boost::shared_ptr<tx_vita_core_3000> sptr;
+ typedef std::shared_ptr<tx_vita_core_3000> sptr;
enum fc_monitor_loc {
FC_DEFAULT,
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 e466e6e44..810c8fd7e 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
@@ -12,11 +12,11 @@
#include <uhd/utils/noncopyable.hpp>
#include <uhd/types/wb_iface.hpp>
#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
class user_settings_core_200 : uhd::noncopyable{
public:
- typedef boost::shared_ptr<user_settings_core_200> sptr;
+ typedef std::shared_ptr<user_settings_core_200> sptr;
typedef std::pair<uint8_t, uint32_t> user_reg_t;
virtual ~user_settings_core_200(void) = 0;
diff --git a/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp b/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp
index bc281e396..4b6d0bd6c 100644
--- a/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp
+++ b/host/lib/include/uhdlib/usrp/cores/user_settings_core_3000.hpp
@@ -10,7 +10,7 @@
#include <uhd/config.hpp>
#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <uhd/types/wb_iface.hpp>
class user_settings_core_3000 : public uhd::wb_iface {