diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-06 11:46:19 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-06 11:46:19 -0700 |
| commit | 9a0087da6c58e93fac6050c4541b1683a02b2d5b (patch) | |
| tree | 495decb3c7a5dd0f1c6dac2b116c1f12859907be /host/lib/device.cpp | |
| parent | 275b29e07f97cdf638ecb22c602d26b7d340547a (diff) | |
| parent | 8ee3d7200169983e7a20409ed5e8c37907fe66e1 (diff) | |
| download | uhd-9a0087da6c58e93fac6050c4541b1683a02b2d5b.tar.gz uhd-9a0087da6c58e93fac6050c4541b1683a02b2d5b.tar.bz2 uhd-9a0087da6c58e93fac6050c4541b1683a02b2d5b.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhd into rfx
Diffstat (limited to 'host/lib/device.cpp')
| -rw-r--r-- | host/lib/device.cpp | 4 |
1 files changed, 2 insertions, 2 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 |