summaryrefslogtreecommitdiff
path: root/zen/json.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <shieldwed@outlook.com>2019-10-28 23:21:40 +0000
committerDaniel Wilhelm <shieldwed@outlook.com>2019-10-28 23:21:40 +0000
commit8d6d4e48a61fd974c3fb2a85254f9bedd796a2b7 (patch)
tree65292208a81994782e1c16dd84dfcdcc221d0cd7 /zen/json.h
parentMerge branch '10.16' into 'master' (diff)
parentadd upstream 10.17 (diff)
downloadFreeFileSync-8d6d4e48a61fd974c3fb2a85254f9bedd796a2b7.tar.gz
FreeFileSync-8d6d4e48a61fd974c3fb2a85254f9bedd796a2b7.tar.bz2
FreeFileSync-8d6d4e48a61fd974c3fb2a85254f9bedd796a2b7.zip
Merge branch '10.17' into 'master'10.17
10.17 See merge request opensource-tracking/FreeFileSync!14
Diffstat (limited to 'zen/json.h')
-rw-r--r--zen/json.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/zen/json.h b/zen/json.h
index 15157cf7..e6464286 100644
--- a/zen/json.h
+++ b/zen/json.h
@@ -403,7 +403,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();
@@ -418,7 +418,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);
}
const std::string stream_;
bgstack15