xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix join, we dont have a StringView from char array constructor

Browse Source
This commit is contained in:
Maxime Coste 2016-12-17 06:06:07 +00:00
parent 2bdd361948
commit cf10f3f0a0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/string.hh
View File

@ -330,13 +330,13 @@ String replace(StringView str, StringView substr, StringView replacement);
template<typename Container> template<typename Container>
String join(const Container& container, char joiner, bool esc_joiner = true) String join(const Container& container, char joiner, bool esc_joiner = true)
{ {
const char to_escape[] = { joiner, '\\' }; const char to_escape[2] = { joiner, '\\' };
String res; String res;
for (const auto& str : container) for (const auto& str : container)
{ {
if (not res.empty()) if (not res.empty())
res += joiner; res += joiner;
res += esc_joiner ? escape(str, to_escape, '\\') : str; res += esc_joiner ? escape(str, {to_escape, 2}, '\\') : str;
} }
return res; return res;
} }