aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-04-05 18:11:32 -0700
committerJosh Blum <josh@joshknows.com>2010-04-05 18:11:32 -0700
commited5cb33eb402c5d34c330d1b9dcb99658c628a72 (patch)
treebb0a96351c4ce770b5f468558c1b8ff056f05e8e /host/lib
parent57f1f769e5e5bb07a5385955eee9390d0e1de908 (diff)
downloaduhd-ed5cb33eb402c5d34c330d1b9dcb99658c628a72.tar.gz
uhd-ed5cb33eb402c5d34c330d1b9dcb99658c628a72.tar.bz2
uhd-ed5cb33eb402c5d34c330d1b9dcb99658c628a72.zip
renamed dict get key and value methods
Diffstat (limited to 'host/lib')
-rw-r--r--host/lib/device.cpp4
-rw-r--r--host/lib/types.cpp4
-rw-r--r--host/lib/usrp/dboard_manager.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index 27a365d34..0197a6232 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -42,7 +42,7 @@ static size_t hash_device_addr(
const device_addr_t &dev_addr
){
//sort the keys of the device address
- std::vector<std::string> keys = dev_addr.get_keys();
+ std::vector<std::string> keys = dev_addr.keys();
std::sort(keys.begin(), keys.end());
//combine the hashes of sorted keys/value pairs
@@ -99,7 +99,7 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
BOOST_FOREACH(device_addr_t dev_addr, fcn.get<0>()(hint)){
//copy keys that were in hint but not in dev_addr
//this way, we can pass additional transport arguments
- BOOST_FOREACH(const std::string &key, hint.get_keys()){
+ BOOST_FOREACH(const std::string &key, hint.keys()){
if (not dev_addr.has_key(key)) dev_addr[key] = hint[key];
}
//append the discovered address and its factory function
diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index d87238161..61a63b710 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -122,7 +122,7 @@ time_spec_t::time_spec_t(boost::posix_time::ptime time, double tick_rate){
std::string device_addr_t::to_string(void) const{
const device_addr_t &device_addr = *this;
std::stringstream ss;
- BOOST_FOREACH(std::string key, device_addr.get_keys()){
+ BOOST_FOREACH(std::string key, device_addr.keys()){
ss << boost::format("%s: %s") % key % device_addr[key] << std::endl;
}
return ss.str();
@@ -138,7 +138,7 @@ static std::string trim(const std::string &in){
std::string device_addr_t::to_args_str(void) const{
std::string args_str;
const device_addr_t &device_addr = *this;
- BOOST_FOREACH(const std::string &key, device_addr.get_keys()){
+ BOOST_FOREACH(const std::string &key, device_addr.keys()){
args_str += key + pair_delim + device_addr[key] + arg_delim;
}
return args_str;
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp
index 3a5cf3a35..4cf2e5820 100644
--- a/host/lib/usrp/dboard_manager.cpp
+++ b/host/lib/usrp/dboard_manager.cpp
@@ -250,11 +250,11 @@ dboard_manager_impl::~dboard_manager_impl(void){
}
prop_names_t dboard_manager_impl::get_rx_subdev_names(void){
- return _rx_dboards.get_keys();
+ return _rx_dboards.keys();
}
prop_names_t dboard_manager_impl::get_tx_subdev_names(void){
- return _tx_dboards.get_keys();
+ return _tx_dboards.keys();
}
wax::obj dboard_manager_impl::get_rx_subdev(const std::string &subdev_name){