diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-17 17:25:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-17 17:25:03 -0700 |
| commit | 864de41af536de1a4e86aa4542e2cfeb21f2d309 (patch) | |
| tree | 259f582fca4b73ea5db4811bf2423294b02477a3 /host/lib/usrp/dboard/db_basic_and_lf.cpp | |
| parent | 0541029e4ecd06e840966b4005af316b92eeb9e5 (diff) | |
| parent | 7d110e73e6b0651f73e8e5b165244f59e66fed87 (diff) | |
| download | uhd-864de41af536de1a4e86aa4542e2cfeb21f2d309.tar.gz uhd-864de41af536de1a4e86aa4542e2cfeb21f2d309.tar.bz2 uhd-864de41af536de1a4e86aa4542e2cfeb21f2d309.zip | |
Merge branch 'next'
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>()){ |