Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2p

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();