diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:48:35 -0700 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:48:35 -0700 |
commit | 2da87fa5082c507d324dce743d63667a6d21fd80 (patch) | |
tree | ead6d4b7e9af0a403d6079134f9fa992dc52102c /host/lib/usrp/dboard/db_basic_and_lf.cpp | |
parent | 40faee2e6d87f7364a0c0c2cf310f1483c0331cf (diff) | |
parent | 8740197dfed997bb235b73ec649edb803d544326 (diff) | |
download | uhd-2da87fa5082c507d324dce743d63667a6d21fd80.tar.gz uhd-2da87fa5082c507d324dce743d63667a6d21fd80.tar.bz2 uhd-2da87fa5082c507d324dce743d63667a6d21fd80.zip |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Diffstat (limited to 'host/lib/usrp/dboard/db_basic_and_lf.cpp')
-rw-r--r-- | host/lib/usrp/dboard/db_basic_and_lf.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/host/lib/usrp/dboard/db_basic_and_lf.cpp b/host/lib/usrp/dboard/db_basic_and_lf.cpp index 9180828d8..f8236d598 100644 --- a/host/lib/usrp/dboard/db_basic_and_lf.cpp +++ b/host/lib/usrp/dboard/db_basic_and_lf.cpp @@ -95,8 +95,7 @@ basic_rx::~basic_rx(void){ } void basic_rx::rx_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<subdev_prop_t>()){ @@ -161,8 +160,7 @@ void basic_rx::rx_get(const wax::obj &key_, wax::obj &val){ } void basic_rx::rx_set(const wax::obj &key_, const 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<subdev_prop_t>()){ @@ -194,8 +192,7 @@ basic_tx::~basic_tx(void){ } void basic_tx::tx_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<subdev_prop_t>()){ @@ -252,8 +249,7 @@ void basic_tx::tx_get(const wax::obj &key_, wax::obj &val){ } void basic_tx::tx_set(const wax::obj &key_, const 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<subdev_prop_t>()){ |