mirrors/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-05-10 00:53:52 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Exclude std::any from implicit conversion

Fixes #3428 (MSVC) and silences compiler warning on GCC (-Wconversion).

* Exclude std::any from implicit conversion
This commit is contained in:
Florian Albrechtskirchinger 2022-04-12 14:08:20 +02:00 committed by GitHub
parent 10344907ff
commit 1deeb434c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/json.hpp
View File

@ -94,6 +94,7 @@ SOFTWARE.
#include <nlohmann/ordered_map.hpp>
#if defined(JSON_HAS_CPP_17)
#include <any>
#include <string_view>
#endif
@ -1891,6 +1892,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
detail::negation<std::is_same<ValueType, std::string_view>>,
#endif
#if defined(JSON_HAS_CPP_17)
detail::negation<std::is_same<ValueType, std::any>>,
#endif
detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
>::value, int >::type = 0 >

4
single_include/nlohmann/json.hpp
View File

@ -17287,6 +17287,7 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
#if defined(JSON_HAS_CPP_17)
#include <any>
#include <string_view>
#endif
@ -19084,6 +19085,9 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
detail::negation<std::is_same<ValueType, std::string_view>>,
#endif
#if defined(JSON_HAS_CPP_17)
detail::negation<std::is_same<ValueType, std::any>>,
#endif
detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
>::value, int >::type = 0 >

13
test/src/unit-regression2.cpp
View File

@ -43,6 +43,7 @@ using ordered_json = nlohmann::ordered_json;
#include <utility>
#ifdef JSON_HAS_CPP_17
#include <any>
#include <variant>
#endif
@ -860,6 +861,18 @@ TEST_CASE("regression tests 2")
CHECK(obj.name == "class");
}
#endif
#if defined(JSON_HAS_CPP_17) && JSON_USE_IMPLICIT_CONVERSIONS
SECTION("issue #3428 - Error occurred when converting nlohmann::json to std::any")
{
json j;
std::any a1 = j;
std::any&& a2 = j;
CHECK(a1.type() == typeid(j));
CHECK(a2.type() == typeid(j));
}
#endif
}
DOCTEST_CLANG_SUPPRESS_WARNING_POP