diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-11 11:17:11 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-16 17:29:22 -0700 |
| commit | 1bee816db5a925b17577010542fbbc459722f481 (patch) | |
| tree | d12d1f89ef5d6db352be6679b90146862606ff90 | |
| parent | 579268112a8d17d527cd4f969346e20f7ce4321e (diff) | |
| download | uhd-1bee816db5a925b17577010542fbbc459722f481.tar.gz uhd-1bee816db5a925b17577010542fbbc459722f481.tar.bz2 uhd-1bee816db5a925b17577010542fbbc459722f481.zip | |
usrp: needed default constructor for MSVC, fixed gain group float warnings
| -rw-r--r-- | host/include/uhd/usrp/subdev_spec.hpp | 3 | ||||
| -rw-r--r-- | host/test/gain_group_test.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/host/include/uhd/usrp/subdev_spec.hpp b/host/include/uhd/usrp/subdev_spec.hpp index 4d8f03b77..56aa0df20 100644 --- a/host/include/uhd/usrp/subdev_spec.hpp +++ b/host/include/uhd/usrp/subdev_spec.hpp @@ -40,7 +40,8 @@ namespace uhd{ namespace usrp{ * \param sd_name the name of a subdevice on that daughterboard */ subdev_spec_pair_t( - const std::string &db_name, const std::string &sd_name + const std::string &db_name = "", + const std::string &sd_name = "" ); }; diff --git a/host/test/gain_group_test.cpp b/host/test/gain_group_test.cpp index 6a6af8eb2..761372e5a 100644 --- a/host/test/gain_group_test.cpp +++ b/host/test/gain_group_test.cpp @@ -52,7 +52,7 @@ class gain_element2{ public: gain_range_t get_range(void){ - return gain_range_t(-20, 10, 0.1); + return gain_range_t(-20, 10, float(0.1)); } float get_value(void){ @@ -94,7 +94,7 @@ static gain_group::sptr get_gain_group(size_t pri1 = 0, size_t pri2 = 0){ /*********************************************************************** * Test cases **********************************************************************/ -static const double tolerance = 0.001; +static const float tolerance = float(0.001); BOOST_AUTO_TEST_CASE(test_gain_group_overall){ gain_group::sptr gg = get_gain_group(); |