From 892a2dd957da3acc1fdd514823b9ae1ea665db73 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 22 Oct 2026 12:02:39 +0200 Subject: [PATCH] Rename diff_target_values::small, which windows.h defines as a macro (rpcndr.h) defines small as char, so test-windows_h did not compile with MSVC. Signed-off-by: Niels Lohmann --- include/nlohmann/json.hpp | 4 ++-- single_include/nlohmann/json.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index a9b6fe0b0..99b771990 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -7515,9 +7515,9 @@ public: private: static constexpr std::size_t inline_size = 16; std::size_t count = 0; - const basic_json** items = small; + const basic_json** items = inline_items; std::vector large{}; // NOLINT(readability-redundant-member-init) - const basic_json* small[inline_size]; // NOLINT(cppcoreguidelines-pro-type-member-init,hicpp-member-init) + const basic_json* inline_items[inline_size]; // NOLINT(cppcoreguidelines-pro-type-member-init,hicpp-member-init) }; /// @brief append "/" and the decimal representation of @a index to @a path diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 45c474078..03811280a 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -40024,9 +40024,9 @@ public: private: static constexpr std::size_t inline_size = 16; std::size_t count = 0; - const basic_json** items = small; + const basic_json** items = inline_items; std::vector large{}; // NOLINT(readability-redundant-member-init) - const basic_json* small[inline_size]; // NOLINT(cppcoreguidelines-pro-type-member-init,hicpp-member-init) + const basic_json* inline_items[inline_size]; // NOLINT(cppcoreguidelines-pro-type-member-init,hicpp-member-init) }; /// @brief append "/" and the decimal representation of @a index to @a path