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
commit 747f7d36d1
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69

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: