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

2 files changed, 4 insertions, 4 deletions

diff --git a/host/test/addr_test.cpp b/host/test/addr_test.cpp
index 2ec6de14b..93b7cc0df 100644
--- a/host/test/addr_test.cpp
+++ b/host/test/addr_test.cpp
@@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE(test_device_addr){
     std::cout << "Pretty Print: " << std::endl << dev_addr.to_string();
     std::string args_str = dev_addr.to_args_str();
     std::cout << "Args String: " << args_str << std::endl;
-    uhd::device_addr_t new_dev_addr = uhd::device_addr_t::from_args_str(args_str);
+    uhd::device_addr_t new_dev_addr(args_str);
 
     //they should be the same size
     BOOST_CHECK_EQUAL(dev_addr.size(), new_dev_addr.size());
diff --git a/host/test/gain_handler_test.cpp b/host/test/gain_handler_test.cpp
index bf2ec5db7..5a9f2b714 100644
--- a/host/test/gain_handler_test.cpp
+++ b/host/test/gain_handler_test.cpp
@@ -72,6 +72,8 @@ private:
         case PROP_GAIN_NAMES:
             val = _gain_values.keys();
             return;
+
+        default: UHD_THROW_PROP_GET_ERROR();
         }
     }
 
@@ -87,9 +89,7 @@ private:
             _gain_values[name] = val.as<float>();
             return;
 
-        case PROP_GAIN_RANGE:
-        case PROP_GAIN_NAMES:
-            throw std::runtime_error("cannot set this property");
+        default: UHD_THROW_PROP_SET_ERROR();
         }
     }