Merge pull request #626 from koemeet/bugfix/vs2017-min-macro-fix
[BugFix] Add parentheses around std::min
This commit is contained in:
commit
7b97100ffd
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user