diff options
author | Josh Blum <josh@joshknows.com> | 2010-08-15 10:51:25 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-08-15 10:51:25 -0700 |
commit | 98ba0cc067489d417342314a7e7408d2dbbc8250 (patch) | |
tree | 7fdcaf08c5bbf150bd03711c9909ed5ca77f1818 /host/lib/usrp/usrp2/usrp2_impl.cpp | |
parent | 6c3d37caa3a47ca534c5e3a110adad0137d5d06d (diff) | |
download | uhd-98ba0cc067489d417342314a7e7408d2dbbc8250.tar.gz uhd-98ba0cc067489d417342314a7e7408d2dbbc8250.tar.bz2 uhd-98ba0cc067489d417342314a7e7408d2dbbc8250.zip |
uhd: extract named prop returns a named prop (not a tuple)
simplifies the code after the property set/get declaration
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 45362c20f..568c87a22 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -201,8 +201,7 @@ usrp2_impl::~usrp2_impl(void){ * Device Properties **********************************************************************/ void usrp2_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>()){ @@ -212,7 +211,7 @@ void usrp2_impl::get(const wax::obj &key_, wax::obj &val){ return; case DEVICE_PROP_MBOARD: - val = _mboard_dict[name]->get_link(); + val = _mboard_dict[key.name]->get_link(); return; case DEVICE_PROP_MBOARD_NAMES: |