Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2017-03-15 17:45:19 +02:00
commit 327686c1ce

View file

@ -187,8 +187,8 @@ static inline bool isUrlTag(const ucstring &s, ucstring::size_type index, ucstri
if (isUrl && i > 0 && !markdown)
{
// '}' is in the list because of color tags, ie "@{FFFF}http://..."
const ucchar chars[] = {' ', '"', '\'', '(', '[', '}'};
isUrl = std::find(std::begin(chars), std::end(chars), s[i - 1]) != std::end(chars);
const vector<ucchar> chars {' ', '"', '\'', '(', '[', '}'};
isUrl = std::find(chars.begin(), chars.end(), s[i - 1]) != chars.end();
}
return isUrl;
}