External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-add value_type detection to is_constructible_string_type trait

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2022-07-23 22:09:51 +02:00
parent e91686cc17
commit 372a47a7fa
No known key found for this signature in database
GPG Key ID: 19618CE9B2D4BE6D
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/nlohmann/detail/meta/type_traits.hpp
View File

@ -363,8 +363,10 @@ struct is_constructible_string_type
#endif #endif
static constexpr auto value = static constexpr auto value =
is_constructible<laundered_type, conjunction <
typename BasicJsonType::string_t>::value; is_constructible<laundered_type, typename BasicJsonType::string_t>,
is_detected_exact<typename BasicJsonType::string_t::value_type,
value_type_t, laundered_type >>::value;
}; };
template<typename BasicJsonType, typename CompatibleArrayType, typename = void> template<typename BasicJsonType, typename CompatibleArrayType, typename = void>

6
single_include/nlohmann/json.hpp
View File

@ -3651,8 +3651,10 @@ struct is_constructible_string_type
#endif #endif
static constexpr auto value = static constexpr auto value =
is_constructible<laundered_type, conjunction <
typename BasicJsonType::string_t>::value; is_constructible<laundered_type, typename BasicJsonType::string_t>,
is_detected_exact<typename BasicJsonType::string_t::value_type,
value_type_t, laundered_type >>::value;
}; };
template<typename BasicJsonType, typename CompatibleArrayType, typename = void> template<typename BasicJsonType, typename CompatibleArrayType, typename = void>