From 771b5cebda250f2a6a65aa7788e9051c94974c2b Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 6 Jan 2011 15:38:56 -0800 Subject: uhd: integrated boost split or tokenizer into source files, remove string split from algorithms header --- host/lib/types/device_addr.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'host/lib/types') diff --git a/host/lib/types/device_addr.cpp b/host/lib/types/device_addr.cpp index 4fdce097b..14afaa24b 100644 --- a/host/lib/types/device_addr.cpp +++ b/host/lib/types/device_addr.cpp @@ -32,19 +32,15 @@ static std::string trim(const std::string &in){ return boost::algorithm::trim_copy(in); } -static boost::tokenizer > tokenize( - const std::string &input, const std::string &tok -){ - return boost::tokenizer >( - input, boost::char_separator(tok.c_str()) - ); -} +#define tokenizer(inp, sep) \ + boost::tokenizer > \ + (inp, boost::char_separator(sep.c_str())) device_addr_t::device_addr_t(const std::string &args){ - BOOST_FOREACH(const std::string &pair, tokenize(args, arg_delim)){ + BOOST_FOREACH(const std::string &pair, tokenizer(args, arg_delim)){ if (trim(pair) == "") continue; std::string key; - BOOST_FOREACH(const std::string &tok, tokenize(pair, pair_delim)){ + BOOST_FOREACH(const std::string &tok, tokenizer(pair, pair_delim)){ if (key.empty()) key = tok; else{ this->set(trim(key), trim(tok)); -- cgit v1.2.3