Skip to content

Commit

Permalink
Add parentheses around std::min so it bypasses the macro introduced b…
Browse files Browse the repository at this point in the history
…y windows.h.
  • Loading branch information
koemeet committed Jun 17, 2017
1 parent 1fbb82d commit 04a1666
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 04a1666

Please sign in to comment.