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/b100 | |
| 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/b100')
| -rw-r--r-- | host/lib/usrp/b100/clock_ctrl.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/host/lib/usrp/b100/clock_ctrl.cpp b/host/lib/usrp/b100/clock_ctrl.cpp index c06b44c49..58e57d7b5 100644 --- a/host/lib/usrp/b100/clock_ctrl.cpp +++ b/host/lib/usrp/b100/clock_ctrl.cpp @@ -14,7 +14,6 @@ #include <uhd/utils/safe_call.hpp> #include <stdint.h> #include "b100_regs.hpp" //spi slave constants -#include <boost/assign/list_of.hpp> #include <boost/format.hpp> #include <boost/math/common_factor_rt.hpp> //gcd #include <algorithm> @@ -516,11 +515,14 @@ private: void send_all_regs(void){ //setup a list of register ranges to write typedef std::pair<uint16_t, uint16_t> range_t; - static const std::vector<range_t> ranges = boost::assign::list_of - (range_t(0x000, 0x000)) (range_t(0x010, 0x01F)) - (range_t(0x0F0, 0x0FD)) (range_t(0x190, 0x19B)) - (range_t(0x1E0, 0x1E1)) (range_t(0x230, 0x230)) - ; + static const std::vector<range_t> ranges{ + range_t(0x000, 0x000), + range_t(0x010, 0x01F), + range_t(0x0F0, 0x0FD), + range_t(0x190, 0x19B), + range_t(0x1E0, 0x1E1), + range_t(0x230, 0x230) + }; //write initial register values and latch/update for(const range_t &range: ranges){ |