From 805d4a0cff00fb4e0071bb300436bb7eefb8fb16 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 12 Aug 2010 10:08:17 -0700
Subject: uhd: made split string utility function

---
 host/lib/utils/paths.cpp   | 10 ++--------
 host/lib/utils/warning.cpp |  8 ++------
 2 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'host/lib/utils')

diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp
index 4029bd989..9ac20d855 100644
--- a/host/lib/utils/paths.cpp
+++ b/host/lib/utils/paths.cpp
@@ -17,7 +17,7 @@
 
 #include "constants.hpp"
 #include <uhd/config.hpp>
-#include <boost/algorithm/string.hpp>
+#include <uhd/utils/algorithm.hpp>
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
@@ -58,15 +58,9 @@ static std::vector<fs::path> get_env_paths(const std::string &var_name){
     po::store(po::parse_environment(desc, boost::bind(&name_mapper, var_name, _1)), vm);
     po::notify(vm);
 
-    //split the path at the path separators
-    std::vector<std::string> path_strings;
-    if (not var_value.empty()) boost::split(//dont split empty strings
-        path_strings, var_value, boost::is_any_of(env_path_sep)
-    );
-
     //convert to filesystem path, filter blank paths
     std::vector<fs::path> paths;
-    BOOST_FOREACH(std::string &path_string, path_strings){
+    BOOST_FOREACH(const std::string &path_string, std::split_string(var_value, env_path_sep)){
         if (path_string.empty()) continue;
         paths.push_back(fs::system_complete(path_string));
     }
diff --git a/host/lib/utils/warning.cpp b/host/lib/utils/warning.cpp
index ae4d4c7aa..8a7d35a23 100644
--- a/host/lib/utils/warning.cpp
+++ b/host/lib/utils/warning.cpp
@@ -16,7 +16,7 @@
 //
 
 #include <uhd/utils/warning.hpp>
-#include <boost/algorithm/string.hpp>
+#include <uhd/utils/algorithm.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
 #include <vector>
@@ -24,13 +24,9 @@
 using namespace uhd;
 
 void uhd::print_warning(const std::string &msg){
-    //extract the message lines
-    std::vector<std::string> lines;
-    boost::split(lines, msg, boost::is_any_of("\n"));
-
     //print the warning message
     std::cerr << std::endl << "Warning:" << std::endl;
-    BOOST_FOREACH(const std::string &line, lines){
+    BOOST_FOREACH(const std::string &line, std::split_string(msg, "\n")){
         std::cerr << "    " << line << std::endl;
     }
 }
-- 
cgit v1.2.3


From 98ba0cc067489d417342314a7e7408d2dbbc8250 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sun, 15 Aug 2010 10:51:25 -0700
Subject: uhd: extract named prop returns a named prop (not a tuple)

simplifies the code after the property set/get declaration
---
 host/include/uhd/utils/props.hpp         | 33 ++++++++++++++++++--------------
 host/lib/usrp/dboard/db_basic_and_lf.cpp | 12 ++++--------
 host/lib/usrp/dboard/db_dbsrx.cpp        | 29 +++++++---------------------
 host/lib/usrp/dboard/db_rfx.cpp          | 26 +++++++++++--------------
 host/lib/usrp/dboard/db_unknown.cpp      | 12 ++++--------
 host/lib/usrp/dboard/db_wbx.cpp          | 32 ++++++++++++++-----------------
 host/lib/usrp/dboard/db_xcvr2450.cpp     | 32 ++++++++++++++-----------------
 host/lib/usrp/usrp2/codec_impl.cpp       |  8 ++------
 host/lib/usrp/usrp2/dboard_impl.cpp      | 14 ++++++--------
 host/lib/usrp/usrp2/mboard_impl.cpp      | 13 ++++++-------
 host/lib/usrp/usrp2/usrp2_impl.cpp       |  5 ++---
 host/lib/utils/props.cpp                 |  9 +++------
 12 files changed, 92 insertions(+), 133 deletions(-)

(limited to 'host/lib/utils')

diff --git a/host/include/uhd/utils/props.hpp b/host/include/uhd/utils/props.hpp
index f376d2612..fbca03019 100644
--- a/host/include/uhd/utils/props.hpp
+++ b/host/include/uhd/utils/props.hpp
@@ -21,7 +21,6 @@
 #include <uhd/config.hpp>
 #include <uhd/wax.hpp>
 #include <uhd/utils/exception.hpp>
-#include <boost/tuple/tuple.hpp>
 #include <stdexcept>
 #include <vector>
 #include <string>
@@ -36,8 +35,25 @@ namespace uhd{
      * Allows properties to be sub-sectioned by name.
      */
     struct UHD_API named_prop_t{
-        wax::obj key;
-        std::string name;
+        const wax::obj key;
+        const std::string name;
+
+        //! Convert the key to the specified type
+        template<typename T> inline T as(void){
+            return key.as<T>();
+        }
+
+        /*!
+         * Utility function to convert generic key into a named prop.
+         * If the key was already a named prop, the prop will be split.
+         * Otherwise, the key will be the key, and the name will be used.
+         * \param key a reference to the prop object
+         * \param name a reference to the name object
+         * \return a named property struct with key and name
+         */
+        static named_prop_t extract(
+            const wax::obj &key, const std::string &name = ""
+        );
 
         /*!
          * Create a new named prop from key and name.
@@ -47,17 +63,6 @@ namespace uhd{
         named_prop_t(const wax::obj &key, const std::string &name);
     };
 
-    /*!
-     * Utility function to separate a named property into its components.
-     * \param key a reference to the prop object
-     * \param name a reference to the name object
-     * \return a tuple that can be used with boost::tie
-     */
-    UHD_API boost::tuple<wax::obj, std::string> extract_named_prop(
-        const wax::obj &key,
-        const std::string &name = ""
-    );
-
     /*!
      * Throw when getting a not-implemented or write-only property.
      * Throw-site information will be included with this error.
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>()){
diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index 072497dcc..06cf91d3b 100644
--- a/host/lib/usrp/dboard/db_dbsrx.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx.cpp
@@ -500,8 +500,7 @@ void dbsrx::set_bandwidth(float bandwidth){
  * RX Get and Set
  **********************************************************************/
 void dbsrx::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>()){
@@ -514,13 +513,13 @@ void dbsrx::rx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        assert_has(_gains.keys(), name, "dbsrx gain name");
-        val = _gains[name];
+        assert_has(_gains.keys(), key.name, "dbsrx gain name");
+        val = _gains[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_RANGE:
-        assert_has(dbsrx_gain_ranges.keys(), name, "dbsrx gain name");
-        val = dbsrx_gain_ranges[name];
+        assert_has(dbsrx_gain_ranges.keys(), key.name, "dbsrx gain name");
+        val = dbsrx_gain_ranges[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_NAMES:
@@ -543,19 +542,6 @@ void dbsrx::rx_get(const wax::obj &key_, wax::obj &val){
         val = dbsrx_antennas;
         return;
 
-/*
-    case SUBDEV_PROP_QUADRATURE:
-        val = true;
-        return;
-
-    case SUBDEV_PROP_IQ_SWAPPED:
-        val = false;
-        return;
-
-    case SUBDEV_PROP_SPECTRUM_INVERTED:
-        val = false;
-        return;
-*/
     case SUBDEV_PROP_CONNECTION:
         val = SUBDEV_CONN_COMPLEX_IQ;
         return;
@@ -583,8 +569,7 @@ void dbsrx::rx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void dbsrx::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>()){
@@ -594,7 +579,7 @@ void dbsrx::rx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        this->set_gain(val.as<float>(), name);
+        this->set_gain(val.as<float>(), key.name);
         return;
 
     case SUBDEV_PROP_BANDWIDTH:
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index b6b44199a..c3ab96e59 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -398,8 +398,7 @@ double rfx_xcvr::set_lo_freq(
  * RX Get and Set
  **********************************************************************/
 void rfx_xcvr::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>()){
@@ -412,13 +411,13 @@ void rfx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        assert_has(_rx_gains.keys(), name, "rfx rx gain name");
-        val = _rx_gains[name];
+        assert_has(_rx_gains.keys(), key.name, "rfx rx gain name");
+        val = _rx_gains[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_RANGE:
-        assert_has(_rx_gain_ranges.keys(), name, "rfx rx gain name");
-        val = _rx_gain_ranges[name];
+        assert_has(_rx_gain_ranges.keys(), key.name, "rfx rx gain name");
+        val = _rx_gain_ranges[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_NAMES:
@@ -458,8 +457,7 @@ void rfx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void rfx_xcvr::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>()){
@@ -469,7 +467,7 @@ void rfx_xcvr::rx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        this->set_rx_gain(val.as<float>(), name);
+        this->set_rx_gain(val.as<float>(), key.name);
         return;
 
     case SUBDEV_PROP_ANTENNA:
@@ -484,8 +482,7 @@ void rfx_xcvr::rx_set(const wax::obj &key_, const wax::obj &val){
  * TX Get and Set
  **********************************************************************/
 void rfx_xcvr::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>()){
@@ -499,7 +496,7 @@ void rfx_xcvr::tx_get(const wax::obj &key_, wax::obj &val){
 
     case SUBDEV_PROP_GAIN:
     case SUBDEV_PROP_GAIN_RANGE:
-        assert_has(rfx_tx_gain_ranges.keys(), name, "rfx tx gain name");
+        assert_has(rfx_tx_gain_ranges.keys(), key.name, "rfx tx gain name");
         //no controllable tx gains, will not get here
         return;
 
@@ -540,8 +537,7 @@ void rfx_xcvr::tx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void rfx_xcvr::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>()){
@@ -551,7 +547,7 @@ void rfx_xcvr::tx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        this->set_tx_gain(val.as<float>(), name);
+        this->set_tx_gain(val.as<float>(), key.name);
         return;
 
     case SUBDEV_PROP_ANTENNA:
diff --git a/host/lib/usrp/dboard/db_unknown.cpp b/host/lib/usrp/dboard/db_unknown.cpp
index 9dd9b550b..f6f4f4a61 100644
--- a/host/lib/usrp/dboard/db_unknown.cpp
+++ b/host/lib/usrp/dboard/db_unknown.cpp
@@ -78,8 +78,7 @@ unknown_rx::~unknown_rx(void){
 }
 
 void unknown_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>()){
@@ -136,8 +135,7 @@ void unknown_rx::rx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void unknown_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>()){
@@ -169,8 +167,7 @@ unknown_tx::~unknown_tx(void){
 }
 
 void unknown_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>()){
@@ -227,8 +224,7 @@ void unknown_tx::tx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void unknown_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>()){
diff --git a/host/lib/usrp/dboard/db_wbx.cpp b/host/lib/usrp/dboard/db_wbx.cpp
index 3038ce30b..ccd897674 100644
--- a/host/lib/usrp/dboard/db_wbx.cpp
+++ b/host/lib/usrp/dboard/db_wbx.cpp
@@ -467,8 +467,7 @@ double wbx_xcvr::set_lo_freq(
  * RX Get and Set
  **********************************************************************/
 void wbx_xcvr::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>()){
@@ -481,13 +480,13 @@ void wbx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        assert_has(_rx_gains.keys(), name, "wbx rx gain name");
-        val = _rx_gains[name];
+        assert_has(_rx_gains.keys(), key.name, "wbx rx gain name");
+        val = _rx_gains[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_RANGE:
-        assert_has(wbx_rx_gain_ranges.keys(), name, "wbx rx gain name");
-        val = wbx_rx_gain_ranges[name];
+        assert_has(wbx_rx_gain_ranges.keys(), key.name, "wbx rx gain name");
+        val = wbx_rx_gain_ranges[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_NAMES:
@@ -527,8 +526,7 @@ void wbx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void wbx_xcvr::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>()){
@@ -538,7 +536,7 @@ void wbx_xcvr::rx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        this->set_rx_gain(val.as<float>(), name);
+        this->set_rx_gain(val.as<float>(), key.name);
         return;
 
     case SUBDEV_PROP_ANTENNA:
@@ -553,8 +551,7 @@ void wbx_xcvr::rx_set(const wax::obj &key_, const wax::obj &val){
  * TX Get and Set
  **********************************************************************/
 void wbx_xcvr::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>()){
@@ -567,13 +564,13 @@ void wbx_xcvr::tx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        assert_has(_tx_gains.keys(), name, "wbx tx gain name");
-        val = _tx_gains[name];
+        assert_has(_tx_gains.keys(), key.name, "wbx tx gain name");
+        val = _tx_gains[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_RANGE:
-        assert_has(wbx_tx_gain_ranges.keys(), name, "wbx tx gain name");
-        val = wbx_tx_gain_ranges[name];
+        assert_has(wbx_tx_gain_ranges.keys(), key.name, "wbx tx gain name");
+        val = wbx_tx_gain_ranges[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_NAMES:
@@ -613,8 +610,7 @@ void wbx_xcvr::tx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void wbx_xcvr::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>()){
@@ -624,7 +620,7 @@ void wbx_xcvr::tx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        this->set_tx_gain(val.as<float>(), name);
+        this->set_tx_gain(val.as<float>(), key.name);
         return;
 
     case SUBDEV_PROP_ANTENNA:
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp
index 2c94bcd2d..798ff74a3 100644
--- a/host/lib/usrp/dboard/db_xcvr2450.cpp
+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp
@@ -438,8 +438,7 @@ void xcvr2450::set_rx_gain(float gain, const std::string &name){
  * RX Get and Set
  **********************************************************************/
 void xcvr2450::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>()){
@@ -452,13 +451,13 @@ void xcvr2450::rx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        assert_has(_rx_gains.keys(), name, "xcvr rx gain name");
-        val = _rx_gains[name];
+        assert_has(_rx_gains.keys(), key.name, "xcvr rx gain name");
+        val = _rx_gains[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_RANGE:
-        assert_has(xcvr_rx_gain_ranges.keys(), name, "xcvr rx gain name");
-        val = xcvr_rx_gain_ranges[name];
+        assert_has(xcvr_rx_gain_ranges.keys(), key.name, "xcvr rx gain name");
+        val = xcvr_rx_gain_ranges[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_NAMES:
@@ -502,8 +501,7 @@ void xcvr2450::rx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void xcvr2450::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>()){
@@ -513,7 +511,7 @@ void xcvr2450::rx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        this->set_rx_gain(val.as<float>(), name);
+        this->set_rx_gain(val.as<float>(), key.name);
         return;
 
     case SUBDEV_PROP_ANTENNA:
@@ -528,8 +526,7 @@ void xcvr2450::rx_set(const wax::obj &key_, const wax::obj &val){
  * TX Get and Set
  **********************************************************************/
 void xcvr2450::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>()){
@@ -542,13 +539,13 @@ void xcvr2450::tx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        assert_has(_tx_gains.keys(), name, "xcvr tx gain name");
-        val = _tx_gains[name];
+        assert_has(_tx_gains.keys(), key.name, "xcvr tx gain name");
+        val = _tx_gains[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_RANGE:
-        assert_has(xcvr_tx_gain_ranges.keys(), name, "xcvr tx gain name");
-        val = xcvr_tx_gain_ranges[name];
+        assert_has(xcvr_tx_gain_ranges.keys(), key.name, "xcvr tx gain name");
+        val = xcvr_tx_gain_ranges[key.name];
         return;
 
     case SUBDEV_PROP_GAIN_NAMES:
@@ -588,8 +585,7 @@ void xcvr2450::tx_get(const wax::obj &key_, wax::obj &val){
 }
 
 void xcvr2450::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>()){
@@ -599,7 +595,7 @@ void xcvr2450::tx_set(const wax::obj &key_, const wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        this->set_tx_gain(val.as<float>(), name);
+        this->set_tx_gain(val.as<float>(), key.name);
         return;
 
     case SUBDEV_PROP_ANTENNA:
diff --git a/host/lib/usrp/usrp2/codec_impl.cpp b/host/lib/usrp/usrp2/codec_impl.cpp
index b9d51abf5..fc917b102 100644
--- a/host/lib/usrp/usrp2/codec_impl.cpp
+++ b/host/lib/usrp/usrp2/codec_impl.cpp
@@ -40,9 +40,7 @@ void usrp2_mboard_impl::codec_init(void){
 /***********************************************************************
  * RX Codec Properties
  **********************************************************************/
-void usrp2_mboard_impl::rx_codec_get(const wax::obj &key_, wax::obj &val){
-    wax::obj key; std::string name;
-    boost::tie(key, name) = extract_named_prop(key_);
+void usrp2_mboard_impl::rx_codec_get(const wax::obj &key, wax::obj &val){
 
     //handle the get request conditioned on the key
     switch(key.as<codec_prop_t>()){
@@ -69,9 +67,7 @@ void usrp2_mboard_impl::rx_codec_set(const wax::obj &, const wax::obj &){
 /***********************************************************************
  * TX Codec Properties
  **********************************************************************/
-void usrp2_mboard_impl::tx_codec_get(const wax::obj &key_, wax::obj &val){
-    wax::obj key; std::string name;
-    boost::tie(key, name) = extract_named_prop(key_);
+void usrp2_mboard_impl::tx_codec_get(const wax::obj &key, wax::obj &val){
 
     //handle the get request conditioned on the key
     switch(key.as<codec_prop_t>()){
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index 075f22388..bafeb3f15 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -59,8 +59,7 @@ void usrp2_mboard_impl::dboard_init(void){
  * RX DBoard Properties
  **********************************************************************/
 void usrp2_mboard_impl::rx_dboard_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<dboard_prop_t>()){
@@ -69,7 +68,7 @@ void usrp2_mboard_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case DBOARD_PROP_SUBDEV:
-        val = _dboard_manager->get_rx_subdev(name);
+        val = _dboard_manager->get_rx_subdev(key.name);
         return;
 
     case DBOARD_PROP_SUBDEV_NAMES:
@@ -90,7 +89,7 @@ void usrp2_mboard_impl::rx_dboard_get(const wax::obj &key_, wax::obj &val){
 
     case DBOARD_PROP_GAIN_GROUP:
         val = make_gain_group(
-            _dboard_manager->get_rx_subdev(name), _rx_codec_proxy->get_link()
+            _dboard_manager->get_rx_subdev(key.name), _rx_codec_proxy->get_link()
         );
         return;
 
@@ -114,8 +113,7 @@ void usrp2_mboard_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val){
  * TX DBoard Properties
  **********************************************************************/
 void usrp2_mboard_impl::tx_dboard_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<dboard_prop_t>()){
@@ -124,7 +122,7 @@ void usrp2_mboard_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case DBOARD_PROP_SUBDEV:
-        val = _dboard_manager->get_tx_subdev(name);
+        val = _dboard_manager->get_tx_subdev(key.name);
         return;
 
     case DBOARD_PROP_SUBDEV_NAMES:
@@ -145,7 +143,7 @@ void usrp2_mboard_impl::tx_dboard_get(const wax::obj &key_, wax::obj &val){
 
     case DBOARD_PROP_GAIN_GROUP:
         val = make_gain_group(
-            _dboard_manager->get_tx_subdev(name), _tx_codec_proxy->get_link()
+            _dboard_manager->get_tx_subdev(key.name), _tx_codec_proxy->get_link()
         );
         return;
 
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index 533b60bae..d354a943b 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -189,11 +189,10 @@ void usrp2_mboard_impl::issue_ddc_stream_cmd(const stream_cmd_t &stream_cmd){
 static const std::string dboard_name = "0";
 
 void usrp2_mboard_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 other props
-    if (key.type() == typeid(std::string)){
+    if (key_.type() == typeid(std::string)){
         if (key.as<std::string>() == "mac-addr"){
             byte_vector_t bytes = _iface->read_eeprom(USRP2_I2C_ADDR_MBOARD, USRP2_EE_MBOARD_MAC_ADDR, 6);
             val = mac_addr_t::from_bytes(bytes).to_string();
@@ -224,7 +223,7 @@ void usrp2_mboard_impl::get(const wax::obj &key_, wax::obj &val){
         return;
 
     case MBOARD_PROP_RX_DBOARD:
-        UHD_ASSERT_THROW(name == dboard_name);
+        UHD_ASSERT_THROW(key.name == dboard_name);
         val = _rx_dboard_proxy->get_link();
         return;
 
@@ -233,7 +232,7 @@ void usrp2_mboard_impl::get(const wax::obj &key_, wax::obj &val){
         return;
 
     case MBOARD_PROP_TX_DBOARD:
-        UHD_ASSERT_THROW(name == dboard_name);
+        UHD_ASSERT_THROW(key.name == dboard_name);
         val = _tx_dboard_proxy->get_link();
         return;
 
@@ -242,7 +241,7 @@ void usrp2_mboard_impl::get(const wax::obj &key_, wax::obj &val){
         return;
 
     case MBOARD_PROP_RX_DSP:
-        UHD_ASSERT_THROW(name == "");
+        UHD_ASSERT_THROW(key.name == "");
         val = _rx_dsp_proxy->get_link();
         return;
 
@@ -251,7 +250,7 @@ void usrp2_mboard_impl::get(const wax::obj &key_, wax::obj &val){
         return;
 
     case MBOARD_PROP_TX_DSP:
-        UHD_ASSERT_THROW(name == "");
+        UHD_ASSERT_THROW(key.name == "");
         val = _tx_dsp_proxy->get_link();
         return;
 
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:
diff --git a/host/lib/utils/props.cpp b/host/lib/utils/props.cpp
index fac5fe24f..fc9f8e63f 100644
--- a/host/lib/utils/props.cpp
+++ b/host/lib/utils/props.cpp
@@ -29,15 +29,12 @@ named_prop_t::named_prop_t(
     /* NOP */
 }
 
-typedef boost::tuple<wax::obj, std::string> named_prop_tuple;
-
-named_prop_tuple uhd::extract_named_prop(
+named_prop_t named_prop_t::extract(
     const wax::obj &key,
     const std::string &name
 ){
     if (key.type() == typeid(named_prop_t)){
-        named_prop_t np = key.as<named_prop_t>();
-        return named_prop_tuple(np.key, np.name);
+        return key.as<named_prop_t>();
     }
-    return named_prop_tuple(key, name);
+    return named_prop_t(key, name);
 }
-- 
cgit v1.2.3