Commit 7b97100f authored by Niels Lohmann's avatar Niels Lohmann Committed by GitHub

Merge pull request #626 from koemeet/bugfix/vs2017-min-macro-fix

[BugFix] Add parentheses around std::min
parents 1fbb82de 04a1666e
......@@ -8987,7 +8987,7 @@ class basic_json
{
// avoid reading too many characters
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:
......
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