summaryrefslogtreecommitdiffstats
path: root/host/lib/device.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-06-14 10:44:50 -0700
committerJosh Blum <josh@joshknows.com>2010-06-14 10:44:50 -0700
commit0c6fbdfe3738e2d15b369fbd28d51ee0115628f9 (patch)
tree16e6c263f55957887ec57da055f27c2cb65f1b23 /host/lib/device.cpp
parent126444c564d30d65116be5f772bdf47594d62884 (diff)
downloaduhd-0c6fbdfe3738e2d15b369fbd28d51ee0115628f9.tar.gz
uhd-0c6fbdfe3738e2d15b369fbd28d51ee0115628f9.tar.bz2
uhd-0c6fbdfe3738e2d15b369fbd28d51ee0115628f9.zip
work on algorithms and documentation
Diffstat (limited to 'host/lib/device.cpp')
-rw-r--r--host/lib/device.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index f139ecb20..431595c4f 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -19,13 +19,13 @@
#include <uhd/types/dict.hpp>
#include <uhd/utils/assert.hpp>
#include <uhd/utils/static.hpp>
+#include <uhd/utils/algorithm.hpp>
#include <boost/foreach.hpp>
#include <boost/format.hpp>
#include <boost/weak_ptr.hpp>
#include <boost/functional/hash.hpp>
#include <boost/tuple/tuple.hpp>
#include <stdexcept>
-#include <algorithm>
using namespace uhd;
@@ -41,13 +41,9 @@ using namespace uhd;
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.keys();
- std::sort(keys.begin(), keys.end());
-
//combine the hashes of sorted keys/value pairs
size_t hash = 0;
- BOOST_FOREACH(const std::string &key, keys){
+ BOOST_FOREACH(const std::string &key, std::sorted(dev_addr.keys())){
boost::hash_combine(hash, key);
boost::hash_combine(hash, dev_addr[key]);
}