aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-08-11 11:17:11 -0700
committerJosh Blum <josh@joshknows.com>2010-08-11 11:17:11 -0700
commite581e0af0ab0387b03e20c5eadec157bcbb777ca (patch)
tree6466dccc75fbf8addc9ff4db5b837f793c0fb0b2
parent349d99c988b2eeb3d13d6229cbd4b80bc9f8153a (diff)
downloaduhd-e581e0af0ab0387b03e20c5eadec157bcbb777ca.tar.gz
uhd-e581e0af0ab0387b03e20c5eadec157bcbb777ca.tar.bz2
uhd-e581e0af0ab0387b03e20c5eadec157bcbb777ca.zip
usrp: needed default constructor for MSVC, fixed gain group float warnings
-rw-r--r--host/include/uhd/usrp/subdev_spec.hpp3
-rw-r--r--host/test/gain_group_test.cpp4
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();