j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
[BugFix] Add parentheses around std::min
This commit is contained in:
Niels Lohmann 2017-06-17 23:58:13 +02:00 committed by GitHub
commit 7b97100ffd
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/json.hpp
View file

@ -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: