Compare commits

..
Author SHA1 Message Date
Niels Lohmann fd0ca40ea6 Extract C++17-only content from unit-items.cpp into its own test file
unit-items.cpp is a 1433-line file that was being compiled twice per
CI configuration (once for C++11, once for C++17) purely because it
contained a single, small JSON_HAS_CPP_17-gated SECTION ("structured
bindings", 14 lines). Move that SECTION into a new, dedicated file
(tests/src/unit-items-cpp17.cpp) so only that tiny file needs a
second build; unit-items.cpp itself now builds/tests only once. No
tests/CMakeLists.txt changes are needed since the existing
file(GLOB ... src/unit-*.cpp) plus json_test_add_test_for() already
auto-register and standard-gate any new unit-*.cpp file based on
whether it textually contains JSON_HAS_CPP_<N> (the same mechanism
already used for the existing unit-iterators3.cpp file, which follows
the identical pattern).

Verified with plain clang++ under -std=c++11/14/17/20 and via a local
CMake configure+build that:
- unit-items.cpp now only produces a test-items_cpp11 target (the
  former test-items_cpp17 target is gone) and its assertion/test-case
  counts are unchanged (2 test cases / 222 assertions) for every
  standard.
- The new unit-items-cpp17.cpp produces test-items-cpp17_cpp11 (an
  intentionally empty translation unit under C++11 that reports 0
  tests, 0 assertions, SUCCESS) and test-items-cpp17_cpp17 (1 test
  case / 1 assertion, identical to what "structured bindings" ran
  as before it was moved).

Separately, unit-regression1.cpp (1530 lines) was also being built
twice per CI configuration because it contained the substring
JSON_HAS_CPP_17 -- but on inspection this was dead code: an orphaned
"#ifdef JSON_HAS_CPP_17 / #include <variant> / #endif" left over from
when the actual std::variant-based regression test (issue #1292) was
relocated to unit-regression2.cpp. Nothing in unit-regression1.cpp
uses <variant>, so there is no SECTION/TEST_CASE to preserve here;
the dead include is simply removed. This was verified by grepping the
file for any other use of "variant" (none) and confirming issue #1292
is still covered by unit-regression2.cpp. Compiled and ran under
-std=c++11/14/17/20 and via CMake: unit-regression1.cpp now only
produces a test-regression1_cpp11 target (test-regression1_cpp17 is
gone) with an unchanged test-case count (3) under every standard.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
2026-09-05 20:55:44 +02:00
12 changed files with 107 additions and 556 deletions
+1 -1
View File
@@ -241,7 +241,7 @@ update_hedley:
rm -f include/nlohmann/thirdparty/hedley/hedley.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp
curl https://raw.githubusercontent.com/nemequ/hedley/master/hedley.h -o include/nlohmann/thirdparty/hedley/hedley.hpp
$(SED) -i 's/HEDLEY_/JSON_HEDLEY_/g' include/nlohmann/thirdparty/hedley/hedley.hpp
grep -oE "#[[:blank:]]*define[[:blank:]]+JSON_HEDLEY_[A-Za-z0-9_]+" include/nlohmann/thirdparty/hedley/hedley.hpp | awk '{print $$NF}' | grep -v "__" | sort -u | $(SED) 's/^/#undef /' > include/nlohmann/thirdparty/hedley/hedley_undef.hpp
grep "[[:blank:]]*#[[:blank:]]*undef" include/nlohmann/thirdparty/hedley/hedley.hpp | grep -v "__" | sort | uniq | $(SED) 's/ //g' | $(SED) 's/undef/undef /g' > include/nlohmann/thirdparty/hedley/hedley_undef.hpp
$(SED) -i '1s/^/#pragma once\n\n/' include/nlohmann/thirdparty/hedley/hedley.hpp
$(SED) -i '1s/^/#pragma once\n\n/' include/nlohmann/thirdparty/hedley/hedley_undef.hpp
$(MAKE) amalgamate
@@ -1074,9 +1074,9 @@ char* to_chars(char* first, const char* last, FloatType value)
*first++ = '-';
}
JSON_HEDLEY_DIAGNOSTIC_PUSH
#ifdef __GNUC__
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
if (value == 0) // +-0
{
@@ -1086,7 +1086,9 @@ char* to_chars(char* first, const char* last, FloatType value)
*first++ = '0';
return first;
}
JSON_HEDLEY_DIAGNOSTIC_POP
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
+5 -3
View File
@@ -32,9 +32,9 @@
// functions to. As a result, we suppress this warning here to avoid client
// code stumbling over this. See https://github.com/nlohmann/json/issues/4087
// for a discussion.
JSON_HEDLEY_DIAGNOSTIC_PUSH
#if defined(__clang__)
JSON_HEDLEY_PRAGMA(clang diagnostic ignored "-Wweak-vtables")
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wweak-vtables"
#endif
NLOHMANN_JSON_NAMESPACE_BEGIN
@@ -286,4 +286,6 @@ class other_error : public exception
} // namespace detail
NLOHMANN_JSON_NAMESPACE_END
JSON_HEDLEY_DIAGNOSTIC_POP
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
@@ -18,7 +18,6 @@
#endif
#include <nlohmann/detail/abi_macros.hpp>
#include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/string_utils.hpp>
#include <nlohmann/detail/value_t.hpp>
@@ -207,10 +206,10 @@ NLOHMANN_JSON_NAMESPACE_END
namespace std
{
// Fix: https://github.com/nlohmann/json/issues/1401
JSON_HEDLEY_DIAGNOSTIC_PUSH
#if defined(__clang__)
JSON_HEDLEY_PRAGMA(clang diagnostic ignored "-Wmismatched-tags")
// Fix: https://github.com/nlohmann/json/issues/1401
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
template<typename IteratorType>
class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
@@ -224,7 +223,9 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
get<N>(std::declval <
::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
};
JSON_HEDLEY_DIAGNOSTIC_POP
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
} // namespace std
@@ -1849,9 +1849,9 @@ class binary_writer
void write_compact_float(const number_float_t n, detail::input_format_t format)
{
JSON_HEDLEY_DIAGNOSTIC_PUSH
#ifdef __GNUC__
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
if (!std::isfinite(n) || ((static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
@@ -1869,7 +1869,9 @@ class binary_writer
: get_msgpack_float_prefix(n));
write_number(n);
}
JSON_HEDLEY_DIAGNOSTIC_POP
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
public:
+10 -6
View File
@@ -3769,13 +3769,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
bool operator==(const_reference rhs) const noexcept
{
JSON_HEDLEY_DIAGNOSTIC_PUSH
#ifdef __GNUC__
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
const_reference lhs = *this;
JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
JSON_HEDLEY_DIAGNOSTIC_POP
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
/// @brief comparison: equal
@@ -3860,12 +3862,14 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
friend bool operator==(const_reference lhs, const_reference rhs) noexcept
{
JSON_HEDLEY_DIAGNOSTIC_PUSH
#ifdef __GNUC__
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
JSON_HEDLEY_DIAGNOSTIC_POP
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
/// @brief comparison: equal
+1 -4
View File
@@ -17,7 +17,7 @@
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
#undef JSON_HEDLEY_CLANG_HAS_FEATURE
#undef JSON_HEDLEY_CLANG_HAS_WARNING
@@ -108,10 +108,7 @@
#undef JSON_HEDLEY_PELLES_VERSION_CHECK
#undef JSON_HEDLEY_PGI_VERSION
#undef JSON_HEDLEY_PGI_VERSION_CHECK
#undef JSON_HEDLEY_PRAGMA
#undef JSON_HEDLEY_PREDICT
#undef JSON_HEDLEY_PREDICT_FALSE
#undef JSON_HEDLEY_PREDICT_TRUE
#undef JSON_HEDLEY_PRINTF_FORMAT
#undef JSON_HEDLEY_PRIVATE
#undef JSON_HEDLEY_PUBLIC
+32 -25
View File
@@ -4944,9 +4944,9 @@ NLOHMANN_JSON_NAMESPACE_END
// functions to. As a result, we suppress this warning here to avoid client
// code stumbling over this. See https://github.com/nlohmann/json/issues/4087
// for a discussion.
JSON_HEDLEY_DIAGNOSTIC_PUSH
#if defined(__clang__)
JSON_HEDLEY_PRAGMA(clang diagnostic ignored "-Wweak-vtables")
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wweak-vtables"
#endif
NLOHMANN_JSON_NAMESPACE_BEGIN
@@ -5198,7 +5198,9 @@ class other_error : public exception
} // namespace detail
NLOHMANN_JSON_NAMESPACE_END
JSON_HEDLEY_DIAGNOSTIC_POP
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
// #include <nlohmann/detail/macro_scope.hpp>
@@ -5973,8 +5975,6 @@ NLOHMANN_JSON_NAMESPACE_END
// #include <nlohmann/detail/abi_macros.hpp>
// #include <nlohmann/detail/macro_scope.hpp>
// #include <nlohmann/detail/meta/type_traits.hpp>
// #include <nlohmann/detail/string_utils.hpp>
@@ -6204,10 +6204,10 @@ NLOHMANN_JSON_NAMESPACE_END
namespace std
{
// Fix: https://github.com/nlohmann/json/issues/1401
JSON_HEDLEY_DIAGNOSTIC_PUSH
#if defined(__clang__)
JSON_HEDLEY_PRAGMA(clang diagnostic ignored "-Wmismatched-tags")
// Fix: https://github.com/nlohmann/json/issues/1401
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
template<typename IteratorType>
class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
@@ -6221,7 +6221,9 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
get<N>(std::declval <
::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
};
JSON_HEDLEY_DIAGNOSTIC_POP
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
} // namespace std
@@ -18855,9 +18857,9 @@ class binary_writer
void write_compact_float(const number_float_t n, detail::input_format_t format)
{
JSON_HEDLEY_DIAGNOSTIC_PUSH
#ifdef __GNUC__
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
if (!std::isfinite(n) || ((static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
@@ -18875,7 +18877,9 @@ class binary_writer
: get_msgpack_float_prefix(n));
write_number(n);
}
JSON_HEDLEY_DIAGNOSTIC_POP
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
public:
@@ -20048,9 +20052,9 @@ char* to_chars(char* first, const char* last, FloatType value)
*first++ = '-';
}
JSON_HEDLEY_DIAGNOSTIC_PUSH
#ifdef __GNUC__
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
if (value == 0) // +-0
{
@@ -20060,7 +20064,9 @@ char* to_chars(char* first, const char* last, FloatType value)
*first++ = '0';
return first;
}
JSON_HEDLEY_DIAGNOSTIC_POP
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
@@ -25191,13 +25197,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
bool operator==(const_reference rhs) const noexcept
{
JSON_HEDLEY_DIAGNOSTIC_PUSH
#ifdef __GNUC__
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
const_reference lhs = *this;
JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
JSON_HEDLEY_DIAGNOSTIC_POP
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
/// @brief comparison: equal
@@ -25282,12 +25290,14 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
friend bool operator==(const_reference lhs, const_reference rhs) noexcept
{
JSON_HEDLEY_DIAGNOSTIC_PUSH
#ifdef __GNUC__
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wfloat-equal"
#endif
JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
JSON_HEDLEY_DIAGNOSTIC_POP
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
}
/// @brief comparison: equal
@@ -26955,7 +26965,7 @@ struct formatter<nlohmann::NLOHMANN_BASIC_JSON_TPL, char> // NOLINT(cert-dcl58-c
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
#undef JSON_HEDLEY_CLANG_HAS_FEATURE
#undef JSON_HEDLEY_CLANG_HAS_WARNING
@@ -27046,10 +27056,7 @@ struct formatter<nlohmann::NLOHMANN_BASIC_JSON_TPL, char> // NOLINT(cert-dcl58-c
#undef JSON_HEDLEY_PELLES_VERSION_CHECK
#undef JSON_HEDLEY_PGI_VERSION
#undef JSON_HEDLEY_PGI_VERSION_CHECK
#undef JSON_HEDLEY_PRAGMA
#undef JSON_HEDLEY_PREDICT
#undef JSON_HEDLEY_PREDICT_FALSE
#undef JSON_HEDLEY_PREDICT_TRUE
#undef JSON_HEDLEY_PRINTF_FORMAT
#undef JSON_HEDLEY_PRIVATE
#undef JSON_HEDLEY_PUBLIC
+42
View File
@@ -0,0 +1,42 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++ (supporting code)
// | | |__ | | | | | | version 3.12.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT
// This file contains the C++17-only part of unit-items.cpp (structured
// bindings support for json::items()). It is kept in a separate
// translation unit so the (much larger) unit-items.cpp does not need to
// be compiled a second time just for this one SECTION.
#include "doctest_compatibility.h"
#include <nlohmann/json.hpp>
using nlohmann::json;
#ifdef JSON_HAS_CPP_17
#include <map>
#include <string>
TEST_CASE("items()")
{
SECTION("object")
{
SECTION("structured bindings")
{
json j = { {"A", 1}, {"B", 2} };
std::map<std::string, int> m;
for (auto const&[key, value] : j.items())
{
m.emplace(key, value);
}
CHECK(j.get<decltype(m)>() == m);
}
}
}
#endif
-16
View File
@@ -862,22 +862,6 @@ TEST_CASE("items()")
CHECK(counter == 3);
}
#ifdef JSON_HAS_CPP_17
SECTION("structured bindings")
{
json j = { {"A", 1}, {"B", 2} };
std::map<std::string, int> m;
for (auto const&[key, value] : j.items())
{
m.emplace(key, value);
}
CHECK(j.get<decltype(m)>() == m);
}
#endif
}
SECTION("const object")
-486
View File
@@ -1,486 +0,0 @@
// __ _____ _____ _____
// __| | __| | | | JSON for Modern C++
// | | |__ | | | | | | version 3.12.0
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
//
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
// SPDX-License-Identifier: MIT
// This file makes sure that none of the internal JSON_HEDLEY_* macros (vendored
// from https://nemequ.github.io/hedley/, see
// include/nlohmann/thirdparty/hedley/hedley.hpp) leak into the including
// translation unit. include/nlohmann/detail/macro_unscope.hpp is supposed to
// #undef every JSON_HEDLEY_* macro (via hedley_undef.hpp) once json.hpp has
// been fully processed. See https://github.com/nlohmann/json/issues/5408,
// where JSON_HEDLEY_PRAGMA, JSON_HEDLEY_PREDICT_TRUE, JSON_HEDLEY_PREDICT_FALSE,
// and JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE escaped this cleanup because
// hedley_undef.hpp had no matching #undef for them.
//
// The #ifdef/#error checks below are mechanically derived from the full list
// of macro names in hedley_undef.hpp, so every JSON_HEDLEY_* macro is covered
// -- not just the four that leaked historically.
#include "doctest_compatibility.h"
#include <nlohmann/json.hpp>
#ifdef JSON_HEDLEY_ALWAYS_INLINE
#error "JSON_HEDLEY_ALWAYS_INLINE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_ARM_VERSION
#error "JSON_HEDLEY_ARM_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_ARM_VERSION_CHECK
#error "JSON_HEDLEY_ARM_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_ARRAY_PARAM
#error "JSON_HEDLEY_ARRAY_PARAM must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_ASSUME
#error "JSON_HEDLEY_ASSUME must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_BEGIN_C_DECLS
#error "JSON_HEDLEY_BEGIN_C_DECLS must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
#error "JSON_HEDLEY_CLANG_HAS_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CLANG_HAS_BUILTIN
#error "JSON_HEDLEY_CLANG_HAS_BUILTIN must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
#error "JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE
#error "JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CLANG_HAS_EXTENSION
#error "JSON_HEDLEY_CLANG_HAS_EXTENSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CLANG_HAS_FEATURE
#error "JSON_HEDLEY_CLANG_HAS_FEATURE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CLANG_HAS_WARNING
#error "JSON_HEDLEY_CLANG_HAS_WARNING must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_COMPCERT_VERSION
#error "JSON_HEDLEY_COMPCERT_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_COMPCERT_VERSION_CHECK
#error "JSON_HEDLEY_COMPCERT_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CONCAT
#error "JSON_HEDLEY_CONCAT must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CONCAT3
#error "JSON_HEDLEY_CONCAT3 must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CONCAT3_EX
#error "JSON_HEDLEY_CONCAT3_EX must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CONCAT_EX
#error "JSON_HEDLEY_CONCAT_EX must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CONST
#error "JSON_HEDLEY_CONST must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CONSTEXPR
#error "JSON_HEDLEY_CONSTEXPR must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CONST_CAST
#error "JSON_HEDLEY_CONST_CAST must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CPP_CAST
#error "JSON_HEDLEY_CPP_CAST must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CRAY_VERSION
#error "JSON_HEDLEY_CRAY_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_CRAY_VERSION_CHECK
#error "JSON_HEDLEY_CRAY_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_C_DECL
#error "JSON_HEDLEY_C_DECL must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DEPRECATED
#error "JSON_HEDLEY_DEPRECATED must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DEPRECATED_FOR
#error "JSON_HEDLEY_DEPRECATED_FOR must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DIAGNOSTIC_POP
#error "JSON_HEDLEY_DIAGNOSTIC_POP must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DIAGNOSTIC_PUSH
#error "JSON_HEDLEY_DIAGNOSTIC_PUSH must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DMC_VERSION
#error "JSON_HEDLEY_DMC_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_DMC_VERSION_CHECK
#error "JSON_HEDLEY_DMC_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_EMPTY_BASES
#error "JSON_HEDLEY_EMPTY_BASES must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_EMSCRIPTEN_VERSION
#error "JSON_HEDLEY_EMSCRIPTEN_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
#error "JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_END_C_DECLS
#error "JSON_HEDLEY_END_C_DECLS must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_FALL_THROUGH
#error "JSON_HEDLEY_FALL_THROUGH must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_FLAGS
#error "JSON_HEDLEY_FLAGS must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_FLAGS_CAST
#error "JSON_HEDLEY_FLAGS_CAST must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
#error "JSON_HEDLEY_GCC_HAS_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_HAS_BUILTIN
#error "JSON_HEDLEY_GCC_HAS_BUILTIN must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
#error "JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
#error "JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_HAS_EXTENSION
#error "JSON_HEDLEY_GCC_HAS_EXTENSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_HAS_FEATURE
#error "JSON_HEDLEY_GCC_HAS_FEATURE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_HAS_WARNING
#error "JSON_HEDLEY_GCC_HAS_WARNING must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
#error "JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_VERSION
#error "JSON_HEDLEY_GCC_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GCC_VERSION_CHECK
#error "JSON_HEDLEY_GCC_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
#error "JSON_HEDLEY_GNUC_HAS_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_HAS_BUILTIN
#error "JSON_HEDLEY_GNUC_HAS_BUILTIN must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
#error "JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
#error "JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_HAS_EXTENSION
#error "JSON_HEDLEY_GNUC_HAS_EXTENSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_HAS_FEATURE
#error "JSON_HEDLEY_GNUC_HAS_FEATURE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_HAS_WARNING
#error "JSON_HEDLEY_GNUC_HAS_WARNING must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_VERSION
#error "JSON_HEDLEY_GNUC_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_GNUC_VERSION_CHECK
#error "JSON_HEDLEY_GNUC_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_HAS_ATTRIBUTE
#error "JSON_HEDLEY_HAS_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_HAS_BUILTIN
#error "JSON_HEDLEY_HAS_BUILTIN must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
#error "JSON_HEDLEY_HAS_CPP_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
#error "JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
#error "JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_HAS_EXTENSION
#error "JSON_HEDLEY_HAS_EXTENSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_HAS_FEATURE
#error "JSON_HEDLEY_HAS_FEATURE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_HAS_WARNING
#error "JSON_HEDLEY_HAS_WARNING must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_IAR_VERSION
#error "JSON_HEDLEY_IAR_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_IAR_VERSION_CHECK
#error "JSON_HEDLEY_IAR_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_IBM_VERSION
#error "JSON_HEDLEY_IBM_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_IBM_VERSION_CHECK
#error "JSON_HEDLEY_IBM_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_IMPORT
#error "JSON_HEDLEY_IMPORT must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_INLINE
#error "JSON_HEDLEY_INLINE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_INTEL_CL_VERSION
#error "JSON_HEDLEY_INTEL_CL_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
#error "JSON_HEDLEY_INTEL_CL_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_INTEL_VERSION
#error "JSON_HEDLEY_INTEL_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_INTEL_VERSION_CHECK
#error "JSON_HEDLEY_INTEL_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_IS_CONSTANT
#error "JSON_HEDLEY_IS_CONSTANT must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_IS_CONSTEXPR_
#error "JSON_HEDLEY_IS_CONSTEXPR_ must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_LIKELY
#error "JSON_HEDLEY_LIKELY must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_MALLOC
#error "JSON_HEDLEY_MALLOC must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_MCST_LCC_VERSION
#error "JSON_HEDLEY_MCST_LCC_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
#error "JSON_HEDLEY_MCST_LCC_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_MESSAGE
#error "JSON_HEDLEY_MESSAGE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_MSVC_VERSION
#error "JSON_HEDLEY_MSVC_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_MSVC_VERSION_CHECK
#error "JSON_HEDLEY_MSVC_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_NEVER_INLINE
#error "JSON_HEDLEY_NEVER_INLINE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_NON_NULL
#error "JSON_HEDLEY_NON_NULL must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_NO_ESCAPE
#error "JSON_HEDLEY_NO_ESCAPE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_NO_RETURN
#error "JSON_HEDLEY_NO_RETURN must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_NO_THROW
#error "JSON_HEDLEY_NO_THROW must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_NULL
#error "JSON_HEDLEY_NULL must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PELLES_VERSION
#error "JSON_HEDLEY_PELLES_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PELLES_VERSION_CHECK
#error "JSON_HEDLEY_PELLES_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PGI_VERSION
#error "JSON_HEDLEY_PGI_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PGI_VERSION_CHECK
#error "JSON_HEDLEY_PGI_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PRAGMA
#error "JSON_HEDLEY_PRAGMA must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PREDICT
#error "JSON_HEDLEY_PREDICT must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PREDICT_FALSE
#error "JSON_HEDLEY_PREDICT_FALSE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PREDICT_TRUE
#error "JSON_HEDLEY_PREDICT_TRUE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PRINTF_FORMAT
#error "JSON_HEDLEY_PRINTF_FORMAT must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PRIVATE
#error "JSON_HEDLEY_PRIVATE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PUBLIC
#error "JSON_HEDLEY_PUBLIC must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_PURE
#error "JSON_HEDLEY_PURE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_REINTERPRET_CAST
#error "JSON_HEDLEY_REINTERPRET_CAST must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_REQUIRE
#error "JSON_HEDLEY_REQUIRE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_REQUIRE_CONSTEXPR
#error "JSON_HEDLEY_REQUIRE_CONSTEXPR must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_REQUIRE_MSG
#error "JSON_HEDLEY_REQUIRE_MSG must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_RESTRICT
#error "JSON_HEDLEY_RESTRICT must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_RETURNS_NON_NULL
#error "JSON_HEDLEY_RETURNS_NON_NULL must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_SENTINEL
#error "JSON_HEDLEY_SENTINEL must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_STATIC_ASSERT
#error "JSON_HEDLEY_STATIC_ASSERT must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_STATIC_CAST
#error "JSON_HEDLEY_STATIC_CAST must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_STRINGIFY
#error "JSON_HEDLEY_STRINGIFY must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_STRINGIFY_EX
#error "JSON_HEDLEY_STRINGIFY_EX must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_SUNPRO_VERSION
#error "JSON_HEDLEY_SUNPRO_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_SUNPRO_VERSION_CHECK
#error "JSON_HEDLEY_SUNPRO_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TINYC_VERSION
#error "JSON_HEDLEY_TINYC_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TINYC_VERSION_CHECK
#error "JSON_HEDLEY_TINYC_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_ARMCL_VERSION
#error "JSON_HEDLEY_TI_ARMCL_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
#error "JSON_HEDLEY_TI_ARMCL_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CL2000_VERSION
#error "JSON_HEDLEY_TI_CL2000_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
#error "JSON_HEDLEY_TI_CL2000_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CL430_VERSION
#error "JSON_HEDLEY_TI_CL430_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CL430_VERSION_CHECK
#error "JSON_HEDLEY_TI_CL430_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CL6X_VERSION
#error "JSON_HEDLEY_TI_CL6X_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
#error "JSON_HEDLEY_TI_CL6X_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CL7X_VERSION
#error "JSON_HEDLEY_TI_CL7X_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
#error "JSON_HEDLEY_TI_CL7X_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CLPRU_VERSION
#error "JSON_HEDLEY_TI_CLPRU_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
#error "JSON_HEDLEY_TI_CLPRU_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_VERSION
#error "JSON_HEDLEY_TI_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_TI_VERSION_CHECK
#error "JSON_HEDLEY_TI_VERSION_CHECK must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_UNAVAILABLE
#error "JSON_HEDLEY_UNAVAILABLE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_UNLIKELY
#error "JSON_HEDLEY_UNLIKELY must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_UNPREDICTABLE
#error "JSON_HEDLEY_UNPREDICTABLE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_UNREACHABLE
#error "JSON_HEDLEY_UNREACHABLE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_UNREACHABLE_RETURN
#error "JSON_HEDLEY_UNREACHABLE_RETURN must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_VERSION
#error "JSON_HEDLEY_VERSION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_VERSION_DECODE_MAJOR
#error "JSON_HEDLEY_VERSION_DECODE_MAJOR must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_VERSION_DECODE_MINOR
#error "JSON_HEDLEY_VERSION_DECODE_MINOR must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_VERSION_DECODE_REVISION
#error "JSON_HEDLEY_VERSION_DECODE_REVISION must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_VERSION_ENCODE
#error "JSON_HEDLEY_VERSION_ENCODE must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_WARNING
#error "JSON_HEDLEY_WARNING must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_WARN_UNUSED_RESULT
#error "JSON_HEDLEY_WARN_UNUSED_RESULT must not remain defined after including json.hpp"
#endif
#ifdef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
#error "JSON_HEDLEY_WARN_UNUSED_RESULT_MSG must not remain defined after including json.hpp"
#endif
TEST_CASE("no JSON_HEDLEY_* macro leaks after including json.hpp")
{
// if this test compiles at all, none of the JSON_HEDLEY_* macros checked
// above remained defined after including <nlohmann/json.hpp>
CHECK(true);
}
-4
View File
@@ -30,10 +30,6 @@ using nlohmann::json;
#include <cstdio>
#include "make_test_data_available.hpp"
#ifdef JSON_HAS_CPP_17
#include <variant>
#endif
#include "fifo_map.hpp"
/////////////////////////////////////////////////////////////////////