From a41b003a3acfe183f54e55dd745e5d7003e9d592 Mon Sep 17 00:00:00 2001 From: Florian Albrechtskirchinger Date: Tue, 12 Apr 2022 09:16:53 +0200 Subject: [PATCH] Exclude std::any from implicit conversion --- include/nlohmann/json.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 609905a46..b77670803 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1894,7 +1894,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec detail::negation>, #endif #if defined(JSON_HAS_CPP_17) - detail::negation < std::is_same>, + detail::negation>, #endif detail::is_detected_lazy >::value, int >::type = 0 > diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 71b08310a..53c15b651 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -19087,7 +19087,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec detail::negation>, #endif #if defined(JSON_HAS_CPP_17) - detail::negation < std::is_same>, + detail::negation>, #endif detail::is_detected_lazy >::value, int >::type = 0 >