From 04a1666ef2e16de1af840f8bfb5f8e473271159a Mon Sep 17 00:00:00 2001 From: Steffen Brem Date: Sat, 17 Jun 2017 22:01:18 +0200 Subject: [PATCH] Add parentheses around std::min so it bypasses the macro introduced by windows.h. --- src/json.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json.hpp b/src/json.hpp index 7a1fbc23..2ed408c8 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -8987,7 +8987,7 @@ class basic_json { // avoid reading too many characters const size_t max_length = static_cast(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: