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

utf8::dump uses a copy of the output iterator instead of a reference

Browse Source
This commit is contained in:
Maxime Coste 2013-02-27 21:36:28 +01:00
parent 8e07e00f18
commit 9f9ad58b39
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/string.hh
View File

@ -25,8 +25,7 @@ public:
explicit String(Codepoint cp, CharCount count = 1) explicit String(Codepoint cp, CharCount count = 1)
{ {
std::string str; std::string str;
auto it = back_inserter(str); utf8::dump(back_inserter(str), cp);
utf8::dump(it, cp);
for (CharCount i = 0; i < count; ++i) for (CharCount i = 0; i < count; ++i)
m_content += str; m_content += str;
} }
@ -113,8 +112,7 @@ inline String operator"" _str(const char* str, size_t)
inline String codepoint_to_str(Codepoint cp) inline String codepoint_to_str(Codepoint cp)
{ {
std::string str; std::string str;
auto it = back_inserter(str); utf8::dump(back_inserter(str), cp);
utf8::dump(it, cp);
return String(str); return String(str);
} }

2
src/utf8.hh
View File

@ -140,7 +140,7 @@ Codepoint codepoint(Iterator it)
struct invalid_codepoint{}; struct invalid_codepoint{};
template<typename OutputIterator> template<typename OutputIterator>
void dump(OutputIterator& it, Codepoint cp) void dump(OutputIterator&& it, Codepoint cp)
{ {
if (cp <= 0x7F) if (cp <= 0x7F)
*it++ = cp; *it++ = cp;