diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-19 15:43:23 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-19 15:43:23 -0400 |
| commit | 76e88871b21c47c0216e160a5fb926f763ba64fe (patch) | |
| tree | 815918838ee85fc3c655c55d6aca11c8a36bb502 /src/libutil | |
| parent | 00092b2d356293a7af9d4d8125a689f90c461591 (diff) | |
Templatise tokenizeString()
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/util.cc | 7 | ||||
| -rw-r--r-- | src/libutil/util.hh | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 56bf5875d..7f95d3981 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -984,9 +984,9 @@ void _interrupted() ////////////////////////////////////////////////////////////////////// -Strings tokenizeString(const string & s, const string & separators) +template<class C> C tokenizeString(const string & s, const string & separators) { - Strings result; + C result; string::size_type pos = s.find_first_not_of(separators, 0); while (pos != string::npos) { string::size_type end = s.find_first_of(separators, pos + 1); @@ -998,6 +998,9 @@ Strings tokenizeString(const string & s, const string & separators) return result; } +template Strings tokenizeString(const string & s, const string & separators); +template vector<string> tokenizeString(const string & s, const string & separators); + string concatStringsSep(const string & sep, const Strings & ss) { diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 0616288cd..408d99a96 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -286,7 +286,7 @@ MakeError(Interrupted, BaseError) /* String tokenizer. */ -Strings tokenizeString(const string & s, const string & separators = " \t\n\r"); +template<class C> C tokenizeString(const string & s, const string & separators = " \t\n\r"); /* Concatenate the given strings with a separator between the |