diff options
| author | Matt Ettus <matt@ettus.com> | 2010-03-08 16:13:49 -0800 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-03-08 16:13:49 -0800 |
| commit | f6582b27c129aac9ea6991a6a5c7e1f5a17cd7a6 (patch) | |
| tree | 3b5efb8a42f3898a3773c798befd812b015d84d9 /host/lib/device_addr.cpp | |
| parent | e273ea92d83d46ca350ac07e3d836a4d99b106c2 (diff) | |
| parent | 1b965831ae7588c7879d84de4e5fbd78ca614761 (diff) | |
| download | uhd-f6582b27c129aac9ea6991a6a5c7e1f5a17cd7a6.tar.gz uhd-f6582b27c129aac9ea6991a6a5c7e1f5a17cd7a6.tar.bz2 uhd-f6582b27c129aac9ea6991a6a5c7e1f5a17cd7a6.zip | |
Merge branch 'u1e_uhd' of ettus.sourcerepo.com:ettus/uhd into u1e_uhd
Diffstat (limited to 'host/lib/device_addr.cpp')
| -rw-r--r-- | host/lib/device_addr.cpp | 4 |
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; } |