summaryrefslogtreecommitdiffstats
path: root/host/lib/device_addr.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-02-25 18:32:32 -0800
committerJosh Blum <josh@joshknows.com>2010-02-25 18:32:32 -0800
commit5715b2c4937ca094ca8f1d9d9b55c4edcc959981 (patch)
tree5584017d251a4103a6ebb3d0b504039728d4ddf3 /host/lib/device_addr.cpp
parent3571f65a1184dd65be39bc19708cc316fd017497 (diff)
downloaduhd-5715b2c4937ca094ca8f1d9d9b55c4edcc959981.tar.gz
uhd-5715b2c4937ca094ca8f1d9d9b55c4edcc959981.tar.bz2
uhd-5715b2c4937ca094ca8f1d9d9b55c4edcc959981.zip
Created empty usrp1e cpp file for the case when headers are not found.
Worked on the device make and discovery to fix certain problems. Added node param to discover usrps for usrp1e, made addr optional.
Diffstat (limited to 'host/lib/device_addr.cpp')
-rw-r--r--host/lib/device_addr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/device_addr.cpp b/host/lib/device_addr.cpp
index ffd511f92..9514df981 100644
--- a/host/lib/device_addr.cpp
+++ b/host/lib/device_addr.cpp
@@ -72,7 +72,7 @@ std::ostream& operator<<(std::ostream &os, const uhd::mac_addr_t &x){
}
//----------------------- usrp device_addr_t wrapper -------------------------//
-std::string uhd::device_addr_to_string(const uhd::device_addr_t &device_addr){
+std::string uhd::device_addr::to_string(const uhd::device_addr_t &device_addr){
std::stringstream ss;
BOOST_FOREACH(std::string key, device_addr.get_keys()){
ss << boost::format("%s: %s") % key % device_addr[key] << std::endl;
@@ -81,6 +81,6 @@ std::string uhd::device_addr_to_string(const uhd::device_addr_t &device_addr){
}
std::ostream& operator<<(std::ostream &os, const uhd::device_addr_t &device_addr){
- os << uhd::device_addr_to_string(device_addr);
+ os << uhd::device_addr::to_string(device_addr);
return os;
}