diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp index 450ba943f..1dfce432d 100644 --- a/include/nlohmann/detail/macro_scope.hpp +++ b/include/nlohmann/detail/macro_scope.hpp @@ -137,6 +137,15 @@ // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has a syntax error #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427 #define JSON_HAS_RANGES 0 + // libstdc++ < 11 has incomplete C++20 ranges (issue #4440) + #elif defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 11 + #define JSON_HAS_RANGES 0 + // libc++ < 16 has incomplete C++20 ranges (issue #4440) + #elif defined(__clang__) && !defined(__apple_build_version__) \ + && __clang_major__ < 16 && defined(__GLIBCXX__) + #define JSON_HAS_RANGES 0 + #elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000 + #define JSON_HAS_RANGES 0 #elif defined(__cpp_lib_ranges) #define JSON_HAS_RANGES 1 #else diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 5e44e8d70..fefc750fd 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -400,7 +400,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec }; std::unique_ptr obj(AllocatorTraits::allocate(alloc, 1), deleter); AllocatorTraits::construct(alloc, obj.get(), std::forward(args)...); - JSON_ASSERT(obj != nullptr); + JSON_ASSERT(obj); return obj.release(); } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 5c661684d..6f0132d20 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -2511,6 +2511,15 @@ JSON_HEDLEY_DIAGNOSTIC_POP // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has a syntax error #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427 #define JSON_HAS_RANGES 0 + // libstdc++ < 11 has incomplete C++20 ranges (issue #4440) + #elif defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 11 + #define JSON_HAS_RANGES 0 + // libc++ < 16 has incomplete C++20 ranges (issue #4440) + #elif defined(__clang__) && !defined(__apple_build_version__) \ + && __clang_major__ < 16 && defined(__GLIBCXX__) + #define JSON_HAS_RANGES 0 + #elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000 + #define JSON_HAS_RANGES 0 #elif defined(__cpp_lib_ranges) #define JSON_HAS_RANGES 1 #else @@ -20911,7 +20920,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec }; std::unique_ptr obj(AllocatorTraits::allocate(alloc, 1), deleter); AllocatorTraits::construct(alloc, obj.get(), std::forward(args)...); - JSON_ASSERT(obj != nullptr); + JSON_ASSERT(obj); return obj.release(); } diff --git a/tests/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp index e6bc34cbf..bf2d87767 100644 --- a/tests/src/unit-regression2.cpp +++ b/tests/src/unit-regression2.cpp @@ -74,6 +74,13 @@ using ordered_json = nlohmann::ordered_json; ///////////////////////////////////////////////////////////////////// template class nlohmann::basic_json<>; +///////////////////////////////////////////////////////////////////// +// for #4440 +///////////////////////////////////////////////////////////////////// +#if JSON_HAS_RANGES == 1 + #include +#endif + // NLOHMANN_JSON_SERIALIZE_ENUM uses a static std::pair DOCTEST_CLANG_SUPPRESS_WARNING_PUSH DOCTEST_CLANG_SUPPRESS_WARNING("-Wexit-time-destructors") @@ -1142,6 +1149,20 @@ TEST_CASE("regression tests 2") CHECK(!result.has_value()); } #endif + +#if JSON_HAS_RANGES == 1 + SECTION("issue #4440 - assert when using std::views::filter and GCC 10") + { + auto noOpFilter = std::views::filter([](auto&&) noexcept + { + return true; + }); + json j = {1, 2, 3}; + auto filtered = j | noOpFilter; + CHECK(*filtered.begin() == 1); + } +#endif + } TEST_CASE_TEMPLATE("issue #4798 - nlohmann::json::to_msgpack() encode float NaN as double", T, double, float) // NOLINT(readability-math-missing-parentheses, bugprone-throwing-static-initialization)