mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-01-21 17:43:25 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Add parentheses around std::min so it bypasses the macro introduced by windows.h.

Browse Source
This commit is contained in:
Steffen Brem 2017-06-17 22:01:18 +02:00
parent 1fbb82de89
commit 04a1666ef2
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: