diff options
| author | Josh Blum <josh@joshknows.com> | 2010-05-02 04:28:50 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-05-02 04:28:50 +0000 |
| commit | 6ec2883fcd3e0b2765c63f2e96e155d52248bf89 (patch) | |
| tree | 123181b29494d3c26ad96f9df65a718def9a65d8 /host/lib/types.cpp | |
| parent | 3a8577aeb3c76dce0d0dcf0c9c7ce8d9aaf0a1d8 (diff) | |
| parent | be97b68ba230e16b513e5a0310aded49f4b2dcb4 (diff) | |
| download | uhd-6ec2883fcd3e0b2765c63f2e96e155d52248bf89.tar.gz uhd-6ec2883fcd3e0b2765c63f2e96e155d52248bf89.tar.bz2 uhd-6ec2883fcd3e0b2765c63f2e96e155d52248bf89.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'host/lib/types.cpp')
| -rw-r--r-- | host/lib/types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/types.cpp b/host/lib/types.cpp index 14f7651d4..ec9c8ac01 100644 --- a/host/lib/types.cpp +++ b/host/lib/types.cpp @@ -143,7 +143,7 @@ device_addr_t::device_addr_t(const std::string &args){ } } -std::string device_addr_t::to_string(void) const{ +std::string device_addr_t::to_pp_string(void) const{ if (this->size() == 0) return "Empty Device Address"; std::stringstream ss; @@ -153,7 +153,7 @@ std::string device_addr_t::to_string(void) const{ return ss.str(); } -std::string device_addr_t::to_args_str(void) const{ +std::string device_addr_t::to_string(void) const{ std::string args_str; BOOST_FOREACH(const std::string &key, this->keys()){ args_str += key + pair_delim + (*this)[key] + arg_delim; |