Exclude std::any from implicit conversion (fixes #3428) (#3437)

Exclude std::any from implicit conversion (fixes #3428) (#3437) · nlohmann/json@1deeb43

3 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ SOFTWARE.`
`94`	`94`	`#include <nlohmann/ordered_map.hpp>`
`95`	`95`
`96`	`96`	`#if defined(JSON_HAS_CPP_17)`
	`97`	`+ #include <any>`
`97`	`98`	`#include <string_view>`
`98`	`99`	`#endif`
`99`	`100`
`@@ -1891,6 +1892,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec`
`1891`	`1892`
`1892`	`1893`	`#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) \|\| (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))`
`1893`	`1894`	`detail::negation<std::is_same<ValueType, std::string_view>>,`
	`1895`	`+#endif`
	`1896`	`+#if defined(JSON_HAS_CPP_17)`
	`1897`	`+ detail::negation<std::is_same<ValueType, std::any>>,`
`1894`	`1898`	`#endif`
`1895`	`1899`	`detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>`
`1896`	`1900`	`>::value, int >::type = 0 >`

Original file line number	Diff line number	Diff line change
`@@ -17287,6 +17287,7 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,`
`17287`	`17287`
`17288`	`17288`
`17289`	`17289`	`#if defined(JSON_HAS_CPP_17)`
	`17290`	`+ #include <any>`
`17290`	`17291`	`#include <string_view>`
`17291`	`17292`	`#endif`
`17292`	`17293`
`@@ -19084,6 +19085,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec`
`19084`	`19085`
`19085`	`19086`	`#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) \|\| (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))`
`19086`	`19087`	`detail::negation<std::is_same<ValueType, std::string_view>>,`
	`19088`	`+#endif`
	`19089`	`+#if defined(JSON_HAS_CPP_17)`
	`19090`	`+ detail::negation<std::is_same<ValueType, std::any>>,`
`19087`	`19091`	`#endif`
`19088`	`19092`	`detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>`
`19089`	`19093`	`>::value, int >::type = 0 >`

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ using ordered_json = nlohmann::ordered_json;`
`43`	`43`	`#include <utility>`
`44`	`44`
`45`	`45`	`#ifdef JSON_HAS_CPP_17`
	`46`	`+ #include <any>`
`46`	`47`	`#include <variant>`
`47`	`48`	`#endif`
`48`	`49`
`@@ -860,6 +861,18 @@ TEST_CASE("regression tests 2")`
`860`	`861`	`CHECK(obj.name == "class");`
`861`	`862`	`}`
`862`	`863`	`#endif`
	`864`	`+`
	`865`	`+#if defined(JSON_HAS_CPP_17) && JSON_USE_IMPLICIT_CONVERSIONS`
	`866`	`+SECTION("issue #3428 - Error occurred when converting nlohmann::json to std::any")`
	`867`	`+ {`
	`868`	`+ json j;`
	`869`	`+ std::any a1 = j;`
	`870`	`+ std::any&& a2 = j;`
	`871`	`+`
	`872`	`+CHECK(a1.type() == typeid(j));`
	`873`	`+CHECK(a2.type() == typeid(j));`
	`874`	`+ }`
	`875`	`+#endif`
`863`	`876`	`}`
`864`	`877`
`865`	`878`	`DOCTEST_CLANG_SUPPRESS_WARNING_POP`