diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-15 10:55:18 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-15 10:55:18 -0700 |
| commit | 45c952399b92d5dc618c469cf48c9980ee6f0e80 (patch) | |
| tree | 077870c0975c97cabd5d8c76e19965aeade2cdc6 /host/utils | |
| parent | 9cb9e7d52255d3e14e57867eee76b555f705954c (diff) | |
| parent | 98ba0cc067489d417342314a7e7408d2dbbc8250 (diff) | |
| download | uhd-45c952399b92d5dc618c469cf48c9980ee6f0e80.tar.gz uhd-45c952399b92d5dc618c469cf48c9980ee6f0e80.tar.bz2 uhd-45c952399b92d5dc618c469cf48c9980ee6f0e80.zip | |
Merge branch 'next' into usrp1
Diffstat (limited to 'host/utils')
| -rw-r--r-- | host/utils/uhd_usrp_probe.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/utils/uhd_usrp_probe.cpp b/host/utils/uhd_usrp_probe.cpp index 097317516..8947034d7 100644 --- a/host/utils/uhd_usrp_probe.cpp +++ b/host/utils/uhd_usrp_probe.cpp @@ -18,6 +18,7 @@ #include <uhd/utils/safe_main.hpp> #include <uhd/device.hpp> #include <uhd/types/ranges.hpp> +#include <uhd/utils/algorithm.hpp> #include <uhd/usrp/device_props.hpp> #include <uhd/usrp/mboard_props.hpp> #include <uhd/usrp/dboard_props.hpp> @@ -26,7 +27,6 @@ #include <uhd/usrp/subdev_props.hpp> #include <uhd/usrp/dboard_id.hpp> #include <boost/program_options.hpp> -#include <boost/algorithm/string.hpp> #include <boost/format.hpp> #include <boost/foreach.hpp> #include <iostream> @@ -43,7 +43,7 @@ static std::string make_border(const std::string &text){ std::stringstream ss; ss << boost::format(" _____________________________________________________") << std::endl; ss << boost::format(" /") << std::endl; - std::vector<std::string> lines; boost::split(lines, text, boost::is_any_of("\n")); + std::vector<std::string> lines = std::split_string(text, "\n"); while (lines.back() == "") lines.pop_back(); //strip trailing newlines if (lines.size()) lines[0] = " " + lines[0]; //indent the title line BOOST_FOREACH(const std::string &line, lines){ |