diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2016-06-16 21:59:10 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-08-09 10:21:53 -0700 |
| commit | c5b076173e2d866f3ee99c113a37183c5ec20f0b (patch) | |
| tree | 748c8436c8777df98a056adf35eea7304ecb76ff /host | |
| parent | 041264b4c46543fcd1a3321017249c1183afa452 (diff) | |
| download | uhd-c5b076173e2d866f3ee99c113a37183c5ec20f0b.tar.gz uhd-c5b076173e2d866f3ee99c113a37183c5ec20f0b.tar.bz2 uhd-c5b076173e2d866f3ee99c113a37183c5ec20f0b.zip | |
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
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/types/device_addr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<boost::char_separator<char> > \ - (inp, boost::char_separator<char>(sep.c_str())) + (inp, boost::char_separator<char>(sep)) device_addr_t::device_addr_t(const std::string &args){ BOOST_FOREACH(const std::string &pair, tokenizer(args, arg_delim)){ |