10 files changed, 21 insertions, 19 deletions
diff --git a/host/lib/usrp/dboard/db_sbx_common.hpp b/host/lib/usrp/dboard/db_sbx_common.hpp
index 4d463603f..9c09f21a3 100644
--- a/host/lib/usrp/dboard/db_sbx_common.hpp
+++ b/host/lib/usrp/dboard/db_sbx_common.hpp
@@ -272,7 +272,7 @@ protected:
      * sbx_version* subclass, and invoke any relevant functions through that
      * object.  This pointer is set to the proper object at construction time.
      */
-    typedef boost::shared_ptr<sbx_versionx> sbx_versionx_sptr;
+    typedef std::shared_ptr<sbx_versionx> sbx_versionx_sptr;
     sbx_versionx_sptr db_actual;
 };
 
diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp
index de1cd3f33..5a8fefeb7 100644
--- a/host/lib/usrp/dboard/db_twinrx.cpp
+++ b/host/lib/usrp/dboard/db_twinrx.cpp
@@ -19,7 +19,7 @@
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/static.hpp>
 #include "dboard_ctor_args.hpp"
-#include <boost/make_shared.hpp>
+#include <memory>
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
 //#include <fstream>    //Needed for _expert->to_dot() below
@@ -229,13 +229,13 @@ private:
 class twinrx_rcvr : public rx_dboard_base
 {
 public:
-    typedef boost::shared_ptr<twinrx_rcvr> sptr;
+    typedef std::shared_ptr<twinrx_rcvr> sptr;
 
     twinrx_rcvr(ctor_args_t args) : rx_dboard_base(args)
     {
         _db_iface = get_iface();
-        twinrx_gpio::sptr gpio_iface = boost::make_shared<twinrx_gpio>(_db_iface);
-        twinrx_cpld_regmap::sptr cpld_regs = boost::make_shared<twinrx_cpld_regmap>();
+        twinrx_gpio::sptr gpio_iface = std::make_shared<twinrx_gpio>(_db_iface);
+        twinrx_cpld_regmap::sptr cpld_regs = std::make_shared<twinrx_cpld_regmap>();
         cpld_regs->initialize(*gpio_iface, false);
         _ctrl = twinrx_ctrl::make(_db_iface, gpio_iface, cpld_regs, get_rx_id());
         _expert = expert_factory::create_container("twinrx_expert");
@@ -304,7 +304,7 @@ public:
     static dboard_base::sptr make_twinrx_fe(dboard_base::ctor_args_t args)
     {
         const dboard_ctor_args_t& db_args = dboard_ctor_args_t::cast(args);
-        sptr container = boost::dynamic_pointer_cast<twinrx_rcvr>(db_args.rx_container);
+        sptr container = std::dynamic_pointer_cast<twinrx_rcvr>(db_args.rx_container);
         if (container) {
             dboard_base::sptr fe = dboard_base::sptr(
                 new twinrx_rcvr_fe(args, container->get_expert(), container->get_ctrl()));
diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp
index 305a69c52..72b3e331d 100644
--- a/host/lib/usrp/dboard/db_ubx.cpp
+++ b/host/lib/usrp/dboard/db_ubx.cpp
@@ -20,7 +20,7 @@
 #include <uhd/utils/safe_call.hpp>
 #include <uhdlib/usrp/common/max287x.hpp>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/math/special_functions/round.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/thread/mutex.hpp>
@@ -1329,10 +1329,10 @@ private:
     ubx_cpld_reg_t _cpld_reg;
     uint32_t _prev_cpld_value;
     std::map<ubx_gpio_field_id_t,ubx_gpio_field_info_t> _gpio_map;
-    boost::shared_ptr<max287x_iface> _txlo1;
-    boost::shared_ptr<max287x_iface> _txlo2;
-    boost::shared_ptr<max287x_iface> _rxlo1;
-    boost::shared_ptr<max287x_iface> _rxlo2;
+    std::shared_ptr<max287x_iface> _txlo1;
+    std::shared_ptr<max287x_iface> _txlo2;
+    std::shared_ptr<max287x_iface> _rxlo1;
+    std::shared_ptr<max287x_iface> _rxlo2;
     double _tx_target_pfd_freq;
     double _rx_target_pfd_freq;
     double _tx_gain;
diff --git a/host/lib/usrp/dboard/db_wbx_common.hpp b/host/lib/usrp/dboard/db_wbx_common.hpp
index ea012c91c..ec6459583 100644
--- a/host/lib/usrp/dboard/db_wbx_common.hpp
+++ b/host/lib/usrp/dboard/db_wbx_common.hpp
@@ -61,7 +61,7 @@
 #include <uhd/usrp/dboard_base.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/format.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/math/special_functions/round.hpp>
 #include <boost/bind.hpp>
 
@@ -200,7 +200,7 @@ protected:
      * wbx_version_* subclass, and invoke any relevant functions through that
      * object.  This pointer is set to the proper object at construction time.
      */
-    typedef boost::shared_ptr<wbx_versionx> wbx_versionx_sptr;
+    typedef std::shared_ptr<wbx_versionx> wbx_versionx_sptr;
     wbx_versionx_sptr db_actual;
 
     uhd::dict<std::string, double> _tx_gains, _rx_gains;
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_cpld_ctrl.hpp b/host/lib/usrp/dboard/magnesium/magnesium_cpld_ctrl.hpp
index 05455e3fd..8f4ee0caa 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_cpld_ctrl.hpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_cpld_ctrl.hpp
@@ -1,5 +1,6 @@
 //
 // Copyright 2017 Ettus Research, a National Instruments Company
+// Copyright 2019 Ettus Research, a National Instruments Brand
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
@@ -12,6 +13,7 @@
 #include <uhd/types/serial.hpp>
 #include <memory>
 #include <mutex>
+#include <functional>
 
 //! Controls the CPLD on a Magnesium daughterboard
 //
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
index 13186e146..32c16adc6 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
@@ -18,7 +18,7 @@
 #include <uhd/rfnoc/registry.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
-#include <boost/make_shared.hpp>
+#include <memory>
 #include <cmath>
 #include <cstdlib>
 #include <sstream>
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_control_init.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_control_init.cpp
index d8a1ccba8..a1b039079 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_control_init.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_control_init.cpp
@@ -14,7 +14,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <boost/make_shared.hpp>
+#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_control.cpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_control.cpp
index df2c3aadd..54c6333bc 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_control.cpp
+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_control.cpp
@@ -18,7 +18,7 @@
 #include <uhdlib/utils/narrow.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
-#include <boost/make_shared.hpp>
+#include <memory>
 #include <cmath>
 #include <cstdlib>
 #include <sstream>
diff --git a/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp b/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp
index a70db79cc..8cee33f17 100644
--- a/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp
+++ b/host/lib/usrp/dboard/rhodium/rhodium_radio_control.hpp
@@ -29,7 +29,7 @@ namespace uhd { namespace rfnoc {
 class rhodium_radio_control_impl : public radio_control_impl
 {
 public:
-    typedef boost::shared_ptr<rhodium_radio_control_impl> sptr;
+    typedef std::shared_ptr<rhodium_radio_control_impl> sptr;
 
     //! Frequency bands for RX. Bands are a function of the analog filter banks
     enum class rx_band {
diff --git a/host/lib/usrp/dboard/twinrx/twinrx_io.hpp b/host/lib/usrp/dboard/twinrx/twinrx_io.hpp
index ea1f1150a..e3e475148 100644
--- a/host/lib/usrp/dboard/twinrx/twinrx_io.hpp
+++ b/host/lib/usrp/dboard/twinrx/twinrx_io.hpp
@@ -41,7 +41,7 @@ static uint32_t get_reg(wb_iface::wb_addr_type addr) {
 class twinrx_gpio : public wb_iface
 {
 public:
-    typedef boost::shared_ptr<twinrx_gpio> sptr;
+    typedef std::shared_ptr<twinrx_gpio> sptr;
 
     //----------------------------------------------
     //Public GPIO fields
@@ -123,7 +123,7 @@ private:    //Members/definitions
 
 class twinrx_cpld_regmap : public uhd::soft_regmap_t {
 public:
-    typedef boost::shared_ptr<twinrx_cpld_regmap> sptr;
+    typedef std::shared_ptr<twinrx_cpld_regmap> sptr;
 
     //----------------------------------------------
     // IF CCA: CPLD 1