diff options
author | Josh Blum <josh@joshknows.com> | 2010-05-03 10:47:27 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-05-03 10:47:27 -0700 |
commit | 48c636ec9d9287303bf5a223b2dd600545933237 (patch) | |
tree | 0ec0fb0d630528b52fdc4a2cf72969a4defbe8f5 /host/lib/types.cpp | |
parent | 22b964a70a456c2fe9e3262668fd7e026e85b1a1 (diff) | |
parent | 4d5df2376b204afb724684d0d864ce0d93fe83fb (diff) | |
download | uhd-48c636ec9d9287303bf5a223b2dd600545933237.tar.gz uhd-48c636ec9d9287303bf5a223b2dd600545933237.tar.bz2 uhd-48c636ec9d9287303bf5a223b2dd600545933237.zip |
Merge branch 'work' of git@ettus.sourcerepo.com:ettus/uhdpriv
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; |