diff options
author | Josh Blum <josh@joshknows.com> | 2010-03-22 09:50:35 +0000 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-03-22 09:50:35 +0000 |
commit | 6ba5135c96d81d23eafa4f0740ebbf113d8c798f (patch) | |
tree | 50dbe1ac4d36c1a00374718d478617dbb18cd2ef /host/test/gain_handler_test.cpp | |
parent | 10ee8022dd22f13f942d8bfeeca3b380224fff52 (diff) | |
parent | d66efda608db9f6a1c2ab64659556b53810d87b7 (diff) | |
download | uhd-6ba5135c96d81d23eafa4f0740ebbf113d8c798f.tar.gz uhd-6ba5135c96d81d23eafa4f0740ebbf113d8c798f.tar.bz2 uhd-6ba5135c96d81d23eafa4f0740ebbf113d8c798f.zip |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into u1e_uhd
Conflicts:
host/include/uhd/usrp/dboard_id.hpp
Diffstat (limited to 'host/test/gain_handler_test.cpp')
-rw-r--r-- | host/test/gain_handler_test.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/host/test/gain_handler_test.cpp b/host/test/gain_handler_test.cpp index a4005c0de..47acb30f0 100644 --- a/host/test/gain_handler_test.cpp +++ b/host/test/gain_handler_test.cpp @@ -17,6 +17,7 @@ #include <boost/test/unit_test.hpp> #include <uhd/gain_handler.hpp> +#include <uhd/types.hpp> #include <uhd/props.hpp> #include <uhd/dict.hpp> #include <boost/bind.hpp> @@ -108,12 +109,10 @@ BOOST_AUTO_TEST_CASE(test_gain_handler){ ); std::cout << "verifying the overall min, max, step" << std::endl; - gain_t gain_min, gain_max, gain_step; - boost::tie(gain_min, gain_max, gain_step) = \ - go0[PROP_GAIN_RANGE].as<gain_range_t>(); - BOOST_CHECK_EQUAL(gain_min, gain_t(-10)); - BOOST_CHECK_EQUAL(gain_max, gain_t(100)); - BOOST_CHECK_EQUAL(gain_step, gain_t(1.5)); + gain_range_t gain = go0[PROP_GAIN_RANGE].as<gain_range_t>(); + BOOST_CHECK_EQUAL(gain.min, gain_t(-10)); + BOOST_CHECK_EQUAL(gain.max, gain_t(100)); + BOOST_CHECK_EQUAL(gain.step, gain_t(1.5)); std::cout << "verifying the overall gain" << std::endl; go0[named_prop_t(PROP_GAIN_VALUE, "g0")] = gain_t(-5); |