aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp_e/usrp_e_impl.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-08-17 19:23:56 +0000
committerJosh Blum <josh@joshknows.com>2010-08-17 19:23:56 +0000
commit1e28ae518de1268efa370eb8b4b206b7d5a49b03 (patch)
tree3f989545009e168064987b3ef70c486c24a21c5b /host/lib/usrp/usrp_e/usrp_e_impl.cpp
parent1aa1404ebb59594a8c81b31f9b56ad35bd832a26 (diff)
downloaduhd-1e28ae518de1268efa370eb8b4b206b7d5a49b03.tar.gz
uhd-1e28ae518de1268efa370eb8b4b206b7d5a49b03.tar.bz2
uhd-1e28ae518de1268efa370eb8b4b206b7d5a49b03.zip
usrp-e: building off of next branch
Diffstat (limited to 'host/lib/usrp/usrp_e/usrp_e_impl.cpp')
-rw-r--r--host/lib/usrp/usrp_e/usrp_e_impl.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp_e/usrp_e_impl.cpp b/host/lib/usrp/usrp_e/usrp_e_impl.cpp
index 0566cfd59..5c0e1dbb0 100644
--- a/host/lib/usrp/usrp_e/usrp_e_impl.cpp
+++ b/host/lib/usrp/usrp_e/usrp_e_impl.cpp
@@ -113,8 +113,7 @@ usrp_e_impl::~usrp_e_impl(void){
* Device Get
**********************************************************************/
void usrp_e_impl::get(const wax::obj &key_, wax::obj &val){
- wax::obj key; std::string name;
- boost::tie(key, name) = extract_named_prop(key_);
+ named_prop_t key = named_prop_t::extract(key_);
//handle the get request conditioned on the key
switch(key.as<device_prop_t>()){
@@ -123,7 +122,7 @@ void usrp_e_impl::get(const wax::obj &key_, wax::obj &val){
return;
case DEVICE_PROP_MBOARD:
- UHD_ASSERT_THROW(name == "");
+ UHD_ASSERT_THROW(key.name == "");
val = _mboard_proxy->get_link();
return;