From 3249b180cc1f664eb668877cdef18bf513ee1109 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 21 May 2026 08:31:03 +0200 Subject: [PATCH] :rotating_light: fix compilation Signed-off-by: Niels Lohmann --- include/nlohmann/detail/output/serializer.hpp | 6 +++--- single_include/nlohmann/json.hpp | 6 +++--- tests/src/unit-inspection.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 6e75aff43..9dabecfd9 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -128,7 +128,7 @@ class serializer const auto new_indent = current_indent + indent_step; if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) { - indent_string.resize(std::max(indent_string.size() * 2, static_cast(new_indent)), indent_char); + indent_string.resize((std::max)(indent_string.size() * 2, static_cast(new_indent)), indent_char); JSON_ASSERT(indent_string.size() >= new_indent); } @@ -202,7 +202,7 @@ class serializer const auto new_indent = current_indent + indent_step; if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) { - indent_string.resize(std::max(indent_string.size() * 2, static_cast(new_indent)), indent_char); + indent_string.resize((std::max)(indent_string.size() * 2, static_cast(new_indent)), indent_char); JSON_ASSERT(indent_string.size() >= new_indent); } @@ -264,7 +264,7 @@ class serializer const auto new_indent = current_indent + indent_step; if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) { - indent_string.resize(std::max(indent_string.size() * 2, static_cast(new_indent)), indent_char); + indent_string.resize((std::max)(indent_string.size() * 2, static_cast(new_indent)), indent_char); JSON_ASSERT(indent_string.size() >= new_indent); } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 663883b12..662c9afb0 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -19302,7 +19302,7 @@ class serializer const auto new_indent = current_indent + indent_step; if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) { - indent_string.resize(std::max(indent_string.size() * 2, static_cast(new_indent)), indent_char); + indent_string.resize((std::max)(indent_string.size() * 2, static_cast(new_indent)), indent_char); JSON_ASSERT(indent_string.size() >= new_indent); } @@ -19376,7 +19376,7 @@ class serializer const auto new_indent = current_indent + indent_step; if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) { - indent_string.resize(std::max(indent_string.size() * 2, static_cast(new_indent)), indent_char); + indent_string.resize((std::max)(indent_string.size() * 2, static_cast(new_indent)), indent_char); JSON_ASSERT(indent_string.size() >= new_indent); } @@ -19438,7 +19438,7 @@ class serializer const auto new_indent = current_indent + indent_step; if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent)) { - indent_string.resize(std::max(indent_string.size() * 2, static_cast(new_indent)), indent_char); + indent_string.resize((std::max)(indent_string.size() * 2, static_cast(new_indent)), indent_char); JSON_ASSERT(indent_string.size() >= new_indent); } diff --git a/tests/src/unit-inspection.cpp b/tests/src/unit-inspection.cpp index 83349484e..d79764bff 100644 --- a/tests/src/unit-inspection.cpp +++ b/tests/src/unit-inspection.cpp @@ -249,7 +249,7 @@ TEST_CASE("object inspection") { SECTION("array") { - const auto j_array = "[[[[[[]]]]]]"_json; + const auto j_array = json::parse("[[[[[[]]]]]]"); // check right size after indentation triggering a resize CHECK(j_array.dump(1024).size() == 25622); // check if right indentation symbol is used @@ -260,7 +260,7 @@ TEST_CASE("object inspection") SECTION("object") { - const auto j_object = R"({"":{"":{"":{"":{"":{}}}}}})"_json; + const auto j_object = json::parse(R"({"":{"":{"":{"":{"":{}}}}}})"); // check right size after indentation triggering a resize CHECK(j_object.dump(1024).size() == 25642); // check if right indentation symbol is used