diff options
| author | Howaner <franzi.moos@googlemail.com> | 2015-03-10 20:05:46 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2015-03-10 20:05:46 +0100 |
| commit | ab420f6cfc8519fb2ec0caa7fb242517244ffcea (patch) | |
| tree | c31c3538db081516d81959ed8ad00259175441a9 /src/StringUtils.h | |
| parent | Changed return type from AbsorbWater() to void. (diff) | |
| parent | Fixed client kick/crash if many block changes happend (diff) | |
| download | cuberite-Sponge.tar cuberite-Sponge.tar.gz cuberite-Sponge.tar.bz2 cuberite-Sponge.tar.lz cuberite-Sponge.tar.xz cuberite-Sponge.tar.zst cuberite-Sponge.zip | |
Diffstat (limited to 'src/StringUtils.h')
| -rw-r--r-- | src/StringUtils.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/StringUtils.h b/src/StringUtils.h index bfe2a41fa..bc3bb7a2c 100644 --- a/src/StringUtils.h +++ b/src/StringUtils.h @@ -115,7 +115,16 @@ a_Output is first cleared and then each separate string is pushed back into a_Ou Returns true if there are at least two strings in a_Output (there was at least one \0 separator). */ extern bool SplitZeroTerminatedStrings(const AString & a_Strings, AStringVector & a_Output); -/// Parses any integer type. Checks bounds and returns errors out of band. +/** Merges the two vectors of strings, removing duplicate entries from the second vector. +The resulting vector contains items from a_Strings1 first, then from a_Strings2. +The order of items doesn't change, only the duplicates are removed. +If a_Strings1 contains duplicates, the result will still contain those duplicates. */ +extern AStringVector MergeStringVectors(const AStringVector & a_Strings1, const AStringVector & a_Strings2); + +/** Concatenates the specified strings into a single string, separated by the specified separator. */ +extern AString StringsConcat(const AStringVector & a_Strings, char a_Separator); + +/** Parses any integer type. Checks bounds and returns errors out of band. */ template <class T> bool StringToInteger(const AString & a_str, T & a_Num) { |