From 5b604dd360ffc162f163962ccb2b1af109a5f93f Mon Sep 17 00:00:00 2001 From: B Stack Date: Thu, 17 Oct 2019 15:59:39 -0400 Subject: add upstream 10.17 --- zen/json.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zen/json.h') 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(pos_, stream_.end()), prefix); + return zen::startsWith(makeStringView(pos_, stream_.end()), prefix); } const std::string stream_; -- cgit