diff options
| author | Josh Blum <josh@joshknows.com> | 2011-05-11 10:38:28 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-05-11 10:38:28 -0700 |
| commit | 328599eec46fde6f16e8cdcfe3e8f096d9466b90 (patch) | |
| tree | 221214f8c28beaa0f5de542a0ff07637cd7fdb5d /host/lib/types | |
| parent | 4e0b42afcbbf1067cef2ad530f3b162e5a35771b (diff) | |
| parent | c9bf4798cc19e9ac9bf2fbcfeeae7ed26936b19d (diff) | |
| download | uhd-328599eec46fde6f16e8cdcfe3e8f096d9466b90.tar.gz uhd-328599eec46fde6f16e8cdcfe3e8f096d9466b90.tar.bz2 uhd-328599eec46fde6f16e8cdcfe3e8f096d9466b90.zip | |
Merge branch 'master' into next
Diffstat (limited to 'host/lib/types')
| -rw-r--r-- | host/lib/types/device_addr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/types/device_addr.cpp b/host/lib/types/device_addr.cpp index 193f76f8c..45d885adc 100644 --- a/host/lib/types/device_addr.cpp +++ b/host/lib/types/device_addr.cpp @@ -73,7 +73,7 @@ std::string device_addr_t::to_string(void) const{ return args_str; } -#include <uhd/utils/warning.hpp> +#include <uhd/utils/msg.hpp> device_addrs_t uhd::separate_device_addr(const device_addr_t &dev_addr){ //------------ support old deprecated way and print warning -------- @@ -85,13 +85,13 @@ device_addrs_t uhd::separate_device_addr(const device_addr_t &dev_addr){ for (size_t i = 0; i < addrs.size(); i++){ fixed_dev_addr[str(boost::format("addr%d") % i)] = addrs[i]; } - uhd::warning::post( + UHD_MSG(warning) << "addr = <space separated list of ip addresses> is deprecated.\n" "To address a multi-device, use multiple <key><index> = <val>.\n" "See the USRP-NXXX application notes. Two device example:\n" " addr0 = 192.168.10.2\n" " addr1 = 192.168.10.3\n" - ); + ; return separate_device_addr(fixed_dev_addr); } } |