aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/dboard/db_twinrx.cpp
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/usrp/dboard/db_twinrx.cpp
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/usrp/dboard/db_twinrx.cpp')
-rw-r--r--host/lib/usrp/dboard/db_twinrx.cpp10
1 files changed, 5 insertions, 5 deletions
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()));