summaryrefslogtreecommitdiff
path: root/zenXml/zenxml/parser.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2019-10-17 15:59:39 -0400
committerB Stack <bgstack15@gmail.com>2019-10-17 15:59:39 -0400
commit5b604dd360ffc162f163962ccb2b1af109a5f93f (patch)
tree65292208a81994782e1c16dd84dfcdcc221d0cd7 /zenXml/zenxml/parser.h
parentMerge branch '10.16' into 'master' (diff)
downloadFreeFileSync-5b604dd360ffc162f163962ccb2b1af109a5f93f.tar.gz
FreeFileSync-5b604dd360ffc162f163962ccb2b1af109a5f93f.tar.bz2
FreeFileSync-5b604dd360ffc162f163962ccb2b1af109a5f93f.zip
add upstream 10.17
Diffstat (limited to 'zenXml/zenxml/parser.h')
-rw-r--r--zenXml/zenxml/parser.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/zenXml/zenxml/parser.h b/zenXml/zenxml/parser.h
index dbf5a8c4..f0c70b66 100644
--- a/zenXml/zenxml/parser.h
+++ b/zenXml/zenxml/parser.h
@@ -401,7 +401,7 @@ public:
for (auto it = pos_; it != stream_.begin(); )
{
--it;
- if (*it == '\r' || *it == '\n')
+ if (isLineBreak(*it))
return pos_ - it - 1;
}
return pos_ - stream_.begin();
@@ -413,7 +413,7 @@ private:
bool startsWith(const std::string& prefix) const
{
- return zen::startsWith(StringRef<const char>(pos_, stream_.end()), prefix);
+ return zen::startsWith(makeStringView(pos_, stream_.end()), prefix);
}
using TokenList = std::vector<std::pair<std::string, Token::Type>>;
bgstack15