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/dboard/db_twinrx.cpp | |
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/dboard/db_twinrx.cpp')
-rw-r--r-- | host/lib/usrp/dboard/db_twinrx.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp index 0d14c7632..523d68185 100644 --- a/host/lib/usrp/dboard/db_twinrx.cpp +++ b/host/lib/usrp/dboard/db_twinrx.cpp @@ -19,7 +19,6 @@ #include <uhd/utils/log.hpp> #include <uhd/utils/static.hpp> #include "dboard_ctor_args.hpp" -#include <boost/assign/list_of.hpp> #include <boost/make_shared.hpp> #include <boost/thread.hpp> #include <boost/thread/mutex.hpp> @@ -100,8 +99,8 @@ public: expert_factory::add_dual_prop_node<double>(_expert, get_rx_subtree(), "los/LO2/freq/value", prepend_ch("los/LO2/freq/desired", _ch_name), prepend_ch("los/LO2/freq/coerced", _ch_name), 0.0, AUTO_RESOLVE_ON_READ_WRITE); - get_rx_subtree()->create<std::vector<std::string> >("los/all/source/options") - .set(boost::assign::list_of("internal")("external")("companion")("disabled")("reimport")); + get_rx_subtree()->create<std::vector<std::string>>("los/all/source/options") + .set({"internal", "external", "companion", "disabled", "reimport"}); expert_factory::add_prop_node<std::string>(_expert, get_rx_subtree(), "los/all/source/value", prepend_ch("los/all/source", _ch_name), "internal", AUTO_RESOLVE_ON_WRITE); @@ -116,14 +115,14 @@ public: "gains/all/value", prepend_ch("gain", _ch_name), 0.0, AUTO_RESOLVE_ON_WRITE); get_rx_subtree()->create<std::vector<std::string> >("gains/all/profile/options") - .set(boost::assign::list_of("low-noise")("low-distortion")("default")); + .set({"low-noise", "low-distortion", "default"}); expert_factory::add_prop_node<std::string>(_expert, get_rx_subtree(), "gains/all/profile/value", prepend_ch("gain_profile", _ch_name), "default", AUTO_RESOLVE_ON_WRITE); //Antenna Specific get_rx_subtree()->create<std::vector<std::string> >("antenna/options") - .set(boost::assign::list_of("RX1")("RX2")); + .set({"RX1", "RX2"}); expert_factory::add_prop_node<std::string>(_expert, get_rx_subtree(), "antenna/value", prepend_ch("antenna", _ch_name), (_ch_name == "0" ? "RX1" : "RX2"), AUTO_RESOLVE_ON_WRITE); |