diff options
author | Josh Blum <josh@joshknows.com> | 2010-08-15 10:55:18 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-08-15 10:55:18 -0700 |
commit | 45c952399b92d5dc618c469cf48c9980ee6f0e80 (patch) | |
tree | 077870c0975c97cabd5d8c76e19965aeade2cdc6 /host/lib/usrp/dboard/db_basic_and_lf.cpp | |
parent | 9cb9e7d52255d3e14e57867eee76b555f705954c (diff) | |
parent | 98ba0cc067489d417342314a7e7408d2dbbc8250 (diff) | |
download | uhd-45c952399b92d5dc618c469cf48c9980ee6f0e80.tar.gz uhd-45c952399b92d5dc618c469cf48c9980ee6f0e80.tar.bz2 uhd-45c952399b92d5dc618c469cf48c9980ee6f0e80.zip |
Merge branch 'next' into usrp1
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>()){ |