From c5b076173e2d866f3ee99c113a37183c5ec20f0b Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Thu, 16 Jun 2016 21:59:10 -0700 Subject: device_addr: change delimiters from std::string to const char* * Works around a FreeBSD oddity where calling c_str() on these strings would return NULL --- host/lib/types/device_addr.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'host/lib') diff --git a/host/lib/types/device_addr.cpp b/host/lib/types/device_addr.cpp index 1554c3e4e..747f61b8d 100644 --- a/host/lib/types/device_addr.cpp +++ b/host/lib/types/device_addr.cpp @@ -1,5 +1,5 @@ // -// Copyright 2011 Ettus Research LLC +// Copyright 2011,2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -26,8 +26,8 @@ using namespace uhd; -static const std::string arg_delim = ","; -static const std::string pair_delim = "="; +static const char* arg_delim = ","; +static const char* pair_delim = "="; static std::string trim(const std::string &in){ return boost::algorithm::trim_copy(in); @@ -35,7 +35,7 @@ static std::string trim(const std::string &in){ #define tokenizer(inp, sep) \ boost::tokenizer > \ - (inp, boost::char_separator(sep.c_str())) + (inp, boost::char_separator(sep)) device_addr_t::device_addr_t(const std::string &args){ BOOST_FOREACH(const std::string &pair, tokenizer(args, arg_delim)){ -- cgit v1.2.3