diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-04-26 13:13:32 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-05-02 17:01:21 -0700 |
| commit | 5d9a7c92d3eb0a9cb719e6e6386d533da59a51db (patch) | |
| tree | 024bda2ede2231784b55c48e1a23ab39fd97182d /host/lib/usrp/usrp2 | |
| parent | c52c0b69fc151c7596f9754e6b1e40dede531134 (diff) | |
| download | uhd-5d9a7c92d3eb0a9cb719e6e6386d533da59a51db.tar.gz uhd-5d9a7c92d3eb0a9cb719e6e6386d533da59a51db.tar.bz2 uhd-5d9a7c92d3eb0a9cb719e6e6386d533da59a51db.zip | |
lib: Purge use of boost::assign, except for uhd::dict
Replaced with initialization lists.
Note: uhd::dict does not work with initializer lists without making
changes to said data structure. This commit has no functional changes,
so keeping the boost::assigns for uhd::dict.
Diffstat (limited to 'host/lib/usrp/usrp2')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index d6ab11969..1be4c7339 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -19,7 +19,6 @@ #include <uhd/utils/safe_call.hpp> #include <boost/format.hpp> #include <boost/bind.hpp> -#include <boost/assign/list_of.hpp> #include <boost/asio/ip/address_v4.hpp> #include <boost/asio.hpp> //used for htonl and ntohl #include <boost/thread.hpp> @@ -699,9 +698,12 @@ usrp2_impl::usrp2_impl(const device_addr_t &_device_addr) : _tree->create<std::string>(mb_path / "clock_source/value") .add_coerced_subscriber(boost::bind(&usrp2_impl::update_clock_source, this, mb, _1)) .set("internal"); - std::vector<std::string> clock_sources = boost::assign::list_of("internal")("external")("mimo"); - if (_mbc[mb].gps and _mbc[mb].gps->gps_detected()) clock_sources.push_back("gpsdo"); - _tree->create<std::vector<std::string> >(mb_path / "clock_source/options").set(clock_sources); + std::vector<std::string> clock_sources{"internal", "external", "mimo"}; + if (_mbc[mb].gps and _mbc[mb].gps->gps_detected()) { + clock_sources.push_back("gpsdo"); + } + _tree->create<std::vector<std::string>>(mb_path / "clock_source/options") + .set(clock_sources); //plug timed commands into tree here switch(_mbc[mb].iface->get_rev()){ case usrp2_iface::USRP_N200: |