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.

6 files changed, 23 insertions, 24 deletions

diff --git a/host/lib/usrp/usrp2/clock_ctrl.hpp b/host/lib/usrp/usrp2/clock_ctrl.hpp
index 53f0d0aef..b82dd4723 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.hpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.hpp
@@ -10,12 +10,12 @@
 
 #include "usrp2_iface.hpp"
 #include <uhd/utils/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <vector>
 
 class usrp2_clock_ctrl : uhd::noncopyable{
 public:
-    typedef boost::shared_ptr<usrp2_clock_ctrl> sptr;
+    typedef std::shared_ptr<usrp2_clock_ctrl> sptr;
 
     virtual ~usrp2_clock_ctrl(void) = 0;
 
diff --git a/host/lib/usrp/usrp2/codec_ctrl.hpp b/host/lib/usrp/usrp2/codec_ctrl.hpp
index 37c8d6fa3..c769d102a 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.hpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.hpp
@@ -9,12 +9,12 @@
 #define INCLUDED_CODEC_CTRL_HPP
 
 #include "usrp2_iface.hpp"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <uhd/utils/noncopyable.hpp>
 
 class usrp2_codec_ctrl : uhd::noncopyable{
 public:
-    typedef boost::shared_ptr<usrp2_codec_ctrl> sptr;
+    typedef std::shared_ptr<usrp2_codec_ctrl> sptr;
 
     virtual ~usrp2_codec_ctrl(void) = 0;
 
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index 7042f0391..d965b4e24 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -24,7 +24,7 @@
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/make_shared.hpp>
+#include <memory>
 #include <iostream>
 #include <chrono>
 #include <thread>
@@ -55,7 +55,7 @@ static const size_t vrt_send_header_offset_words32 = 1;
 class flow_control_monitor{
 public:
     typedef uint32_t seq_type;
-    typedef boost::shared_ptr<flow_control_monitor> sptr;
+    typedef std::shared_ptr<flow_control_monitor> sptr;
 
     /*!
      * Make a new flow control monitor.
@@ -256,14 +256,14 @@ void usrp2_impl::update_tick_rate(const double rate){
     //update the tick rate on all existing streamers -> thread safe
     for(const std::string &mb:  _mbc.keys()){
         for (size_t i = 0; i < _mbc[mb].rx_streamers.size(); i++){
-            boost::shared_ptr<sph::recv_packet_streamer> my_streamer =
-                boost::dynamic_pointer_cast<sph::recv_packet_streamer>(_mbc[mb].rx_streamers[i].lock());
+            std::shared_ptr<sph::recv_packet_streamer> my_streamer =
+                std::dynamic_pointer_cast<sph::recv_packet_streamer>(_mbc[mb].rx_streamers[i].lock());
             if (my_streamer.get() == NULL) continue;
             my_streamer->set_tick_rate(rate);
         }
         for (size_t i = 0; i < _mbc[mb].tx_streamers.size(); i++){
-            boost::shared_ptr<sph::send_packet_streamer> my_streamer =
-                boost::dynamic_pointer_cast<sph::send_packet_streamer>(_mbc[mb].tx_streamers[i].lock());
+            std::shared_ptr<sph::send_packet_streamer> my_streamer =
+                std::dynamic_pointer_cast<sph::send_packet_streamer>(_mbc[mb].tx_streamers[i].lock());
             if (my_streamer.get() == NULL) continue;
             my_streamer->set_tick_rate(rate);
         }
@@ -271,8 +271,8 @@ void usrp2_impl::update_tick_rate(const double rate){
 }
 
 void usrp2_impl::update_rx_samp_rate(const std::string &mb, const size_t dsp, const double rate){
-    boost::shared_ptr<sph::recv_packet_streamer> my_streamer =
-        boost::dynamic_pointer_cast<sph::recv_packet_streamer>(_mbc[mb].rx_streamers[dsp].lock());
+    std::shared_ptr<sph::recv_packet_streamer> my_streamer =
+        std::dynamic_pointer_cast<sph::recv_packet_streamer>(_mbc[mb].rx_streamers[dsp].lock());
     if (my_streamer.get() == NULL) return;
 
     my_streamer->set_samp_rate(rate);
@@ -281,8 +281,8 @@ void usrp2_impl::update_rx_samp_rate(const std::string &mb, const size_t dsp, co
 }
 
 void usrp2_impl::update_tx_samp_rate(const std::string &mb, const size_t dsp, const double rate){
-    boost::shared_ptr<sph::send_packet_streamer> my_streamer =
-        boost::dynamic_pointer_cast<sph::send_packet_streamer>(_mbc[mb].tx_streamers[dsp].lock());
+    std::shared_ptr<sph::send_packet_streamer> my_streamer =
+        std::dynamic_pointer_cast<sph::send_packet_streamer>(_mbc[mb].tx_streamers[dsp].lock());
     if (my_streamer.get() == NULL) return;
 
     my_streamer->set_samp_rate(rate);
@@ -429,7 +429,7 @@ rx_streamer::sptr usrp2_impl::get_rx_stream(const uhd::stream_args_t &args_){
     const size_t spp = args.args.cast<size_t>("spp", bpp/bpi);
 
     //make the new streamer given the samples per packet
-    boost::shared_ptr<sph::recv_packet_streamer> my_streamer = boost::make_shared<sph::recv_packet_streamer>(spp);
+    std::shared_ptr<sph::recv_packet_streamer> my_streamer = std::make_shared<sph::recv_packet_streamer>(spp);
 
     //init some streamer stuff
     my_streamer->resize(args.channels.size());
@@ -498,7 +498,7 @@ tx_streamer::sptr usrp2_impl::get_tx_stream(const uhd::stream_args_t &args_){
     const size_t spp = bpp/convert::get_bytes_per_item(args.otw_format);
 
     //make the new streamer given the samples per packet
-    boost::shared_ptr<sph::send_packet_streamer> my_streamer = boost::make_shared<sph::send_packet_streamer>(spp);
+    std::shared_ptr<sph::send_packet_streamer> my_streamer = std::make_shared<sph::send_packet_streamer>(spp);
 
     //init some streamer stuff
     my_streamer->resize(args.channels.size());
diff --git a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp
index 1e670a7f4..cbb243a79 100644
--- a/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_fifo_ctrl.hpp
@@ -11,7 +11,7 @@
 #include <uhd/types/time_spec.hpp>
 #include <uhd/types/serial.hpp>
 #include <uhd/transport/zero_copy.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/utility.hpp>
 #include <uhd/types/wb_iface.hpp>
 #include <string>
@@ -23,7 +23,7 @@
 class usrp2_fifo_ctrl : public uhd::timed_wb_iface, public uhd::spi_iface
 {
 public:
-    typedef boost::shared_ptr<usrp2_fifo_ctrl> sptr;
+    typedef std::shared_ptr<usrp2_fifo_ctrl> sptr;
 
     //! Make a new FIFO control object
     static sptr make(uhd::transport::zero_copy_if::sptr xport);
diff --git a/host/lib/usrp/usrp2/usrp2_iface.hpp b/host/lib/usrp/usrp2/usrp2_iface.hpp
index 05cdfba54..2752d1a28 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.hpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.hpp
@@ -11,7 +11,7 @@
 #include <uhd/transport/udp_simple.hpp>
 #include <uhd/types/serial.hpp>
 #include <uhd/usrp/mboard_eeprom.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/utility.hpp>
 #include <boost/function.hpp>
 #include "usrp2_regs.hpp"
@@ -26,7 +26,7 @@
 class usrp2_iface : public uhd::timed_wb_iface, public uhd::spi_iface, public uhd::i2c_iface
 {
 public:
-    typedef boost::shared_ptr<usrp2_iface> sptr;
+    typedef std::shared_ptr<usrp2_iface> sptr;
     /*!
      * Make a new usrp2 interface with the control transport.
      * \param ctrl_transport the udp transport object
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 4c86ca7c8..14a3ae8d6 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -32,8 +32,7 @@
 #include <uhd/types/device_addr.hpp>
 #include <uhd/usrp/dboard_manager.hpp>
 #include <uhd/usrp/subdev_spec.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/function.hpp>
 #include <atomic>
 
@@ -84,8 +83,8 @@ private:
         rx_frontend_core_200::sptr rx_fe;
         tx_frontend_core_200::sptr tx_fe;
         std::vector<rx_dsp_core_200::sptr> rx_dsps;
-        std::vector<boost::weak_ptr<uhd::rx_streamer> > rx_streamers;
-        std::vector<boost::weak_ptr<uhd::tx_streamer> > tx_streamers;
+        std::vector<std::weak_ptr<uhd::rx_streamer> > rx_streamers;
+        std::vector<std::weak_ptr<uhd::tx_streamer> > tx_streamers;
         tx_dsp_core_200::sptr tx_dsp;
         time64_core_200::sptr time64;
         user_settings_core_200::sptr user;