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/tests/convert_test.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/tests/convert_test.cpp')
-rw-r--r-- | host/tests/convert_test.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/host/tests/convert_test.cpp b/host/tests/convert_test.cpp index 1253b80d7..862e02073 100644 --- a/host/tests/convert_test.cpp +++ b/host/tests/convert_test.cpp @@ -8,7 +8,6 @@ #include <uhd/convert.hpp> #include <boost/test/unit_test.hpp> #include <stdint.h> -#include <boost/assign/list_of.hpp> #include <complex> #include <vector> #include <cstdlib> @@ -128,13 +127,15 @@ static void test_convert_types_for_floats( //make a list of all prio: best/generic combos typedef std::pair<int, int> int_pair_t; - std::vector<int_pair_t> prios = boost::assign::list_of - (int_pair_t(0, 0)) (int_pair_t(-1, 0)) - (int_pair_t(0, -1)) (int_pair_t(-1, -1)) - ; + const std::vector<int_pair_t> prios{ + int_pair_t(0, 0), + int_pair_t(-1, 0), + int_pair_t(0, -1), + int_pair_t(-1, -1) + }; //loopback foreach prio combo (generic vs best) - for(const int_pair_t &prio: prios){ + for (const auto &prio : prios) { loopback(nsamps, in_id, out_id, input, output, prio.first, prio.second); for (size_t i = 0; i < nsamps; i++){ MY_CHECK_CLOSE(input[i].real(), output[i].real(), value_type(1./(1 << 14))); |