diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-17 17:16:54 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-17 17:16:54 +0000 |
| commit | 1aa1404ebb59594a8c81b31f9b56ad35bd832a26 (patch) | |
| tree | 5de014f592095c659e0e90f2264925210817df6c /host/lib/usrp/usrp2/usrp2_impl.cpp | |
| parent | 1b47702245f0c1f4dda3e0eff487bbe664d48855 (diff) | |
| parent | 7d110e73e6b0651f73e8e5b165244f59e66fed87 (diff) | |
| download | uhd-1aa1404ebb59594a8c81b31f9b56ad35bd832a26.tar.gz uhd-1aa1404ebb59594a8c81b31f9b56ad35bd832a26.tar.bz2 uhd-1aa1404ebb59594a8c81b31f9b56ad35bd832a26.zip | |
Merge branch 'next' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e_merge
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: |