diff options
author | Martin Braun <martin.braun@ettus.com> | 2019-09-28 11:18:57 +0200 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 12:21:32 -0800 |
commit | 1fe98e8701dd0b790b172762c3629db32956d1fc (patch) | |
tree | 7719e69633f9639f1dcdcf00ebf7db6c4cd6dda2 /mpm | |
parent | 8541a9b397fb53034c37dd00289aa96def24d410 (diff) | |
download | uhd-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 'mpm')
-rw-r--r-- | mpm/lib/dboards/e31x_db_manager.cpp | 17 | ||||
-rw-r--r-- | mpm/lib/dboards/neon_manager.cpp | 6 |
2 files changed, 8 insertions, 15 deletions
diff --git a/mpm/lib/dboards/e31x_db_manager.cpp b/mpm/lib/dboards/e31x_db_manager.cpp index b433dde30..3c6346bd3 100644 --- a/mpm/lib/dboards/e31x_db_manager.cpp +++ b/mpm/lib/dboards/e31x_db_manager.cpp @@ -1,5 +1,6 @@ // // Copyright 2018 Ettus Research, a National Instruments Company +// Copyright 2019 Ettus Research, a National Instruments Brand // // SPDX-License-Identifier: GPL-3.0-or-later // @@ -57,23 +58,19 @@ private: uint32_t _slave_num; }; -e31x_db_manager::e31x_db_manager(const std::string &catalina_spidev) +e31x_db_manager::e31x_db_manager(const std::string& catalina_spidev) { // Make the MPM-style low level SPI Regs iface - auto spi_iface = mpm::spi::make_spi_regs_iface( - mpm::spi::spi_iface::make_spidev(catalina_spidev, AD9361_SPI_SPEED_HZ, AD9361_SPI_MODE), + auto spi_iface = mpm::spi::make_spi_regs_iface( + mpm::spi::spi_iface::make_spidev( + catalina_spidev, AD9361_SPI_SPEED_HZ, AD9361_SPI_MODE), AD9361_SPI_ADDR_SHIFT, AD9361_SPI_DATA_SHIFT, AD9361_SPI_READ_CMD, AD9361_SPI_WRITE_CMD); // Make the SPI interface auto spi_io_iface = std::make_shared<e310_ad9361_io_spi>(spi_iface, 0); - // Translate from a std shared_ptr to Boost (for legacy compatability) - auto spi_io_iface_boost = boost::shared_ptr<e310_ad9361_io_spi>( - spi_io_iface.get(), - [spi_io_iface](...) mutable { spi_io_iface.reset(); }); // Make the actual Catalina Ctrl object - _catalina_ctrl = ad9361_ctrl::make_spi( - boost::make_shared<e31x_ad9361_client_t>(), - spi_io_iface_boost); + _catalina_ctrl = + ad9361_ctrl::make_spi(std::make_shared<e31x_ad9361_client_t>(), spi_io_iface); } diff --git a/mpm/lib/dboards/neon_manager.cpp b/mpm/lib/dboards/neon_manager.cpp index 671e44d8d..31ecf7291 100644 --- a/mpm/lib/dboards/neon_manager.cpp +++ b/mpm/lib/dboards/neon_manager.cpp @@ -9,7 +9,6 @@ #include <mpm/spi/spi_iface.hpp> #include <mpm/spi/spi_regs_iface.hpp> #include <mpm/types/regs_iface.hpp> -#include <boost/make_shared.hpp> #include <memory> using namespace mpm::dboards; @@ -73,10 +72,7 @@ neon_manager::neon_manager(const std::string& catalina_spidev) AD9361_SPI_WRITE_CMD); // Make the SPI interface auto spi_io_iface = std::make_shared<e320_ad9361_io_spi>(spi_iface, 0); - // Translate from a std shared_ptr to Boost (for legacy compatability) - auto spi_io_iface_boost = boost::shared_ptr<e320_ad9361_io_spi>( - spi_io_iface.get(), [spi_io_iface](...) mutable { spi_io_iface.reset(); }); // Make the actual Catalina Ctrl object _catalina_ctrl = ad9361_ctrl::make_spi( - boost::make_shared<e320_ad9361_client_t>(), spi_io_iface_boost); + std::make_shared<e320_ad9361_client_t>(), spi_io_iface); } |