Unverified Commit 747f7d36 by Niels Lohmann

Merge branch 'develop' of https://github.com/nlohmann/json into develop

parents b79a1a26 7b97100f
...@@ -8987,7 +8987,7 @@ class basic_json ...@@ -8987,7 +8987,7 @@ class basic_json
{ {
// avoid reading too many characters // avoid reading too many characters
const size_t max_length = static_cast<size_t>(limit - start); const size_t max_length = static_cast<size_t>(limit - start);
return std::string(start + offset, std::min(length, max_length - offset)); return std::string(start + offset, (std::min)(length, max_length - offset));
} }
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment