From 1fe98e8701dd0b790b172762c3629db32956d1fc Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Sat, 28 Sep 2019 11:18:57 +0200
Subject: 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.
---
 host/lib/include/uhdlib/usrp/common/ad9361_ctrl.hpp              | 4 ++--
 host/lib/include/uhdlib/usrp/common/ad936x_manager.hpp           | 4 ++--
 host/lib/include/uhdlib/usrp/common/adf435x.hpp                  | 2 +-
 host/lib/include/uhdlib/usrp/common/fx2_ctrl.hpp                 | 4 ++--
 host/lib/include/uhdlib/usrp/common/max287x.hpp                  | 2 +-
 host/lib/include/uhdlib/usrp/common/recv_packet_demuxer.hpp      | 4 ++--
 host/lib/include/uhdlib/usrp/common/recv_packet_demuxer_3000.hpp | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

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

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