Merge branch 'develop' of https://github.com/nlohmann/json into develop

This commit is contained in:
Niels Lohmann
2017-06-18 00:00:36 +02:00

View File

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