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

Add value_type detection to from_json for strings

Browse Source
This commit is contained in:
Florian Albrechtskirchinger 2022-07-24 07:35:40 +02:00
parent 372a47a7fa
commit 307b828ed5
No known key found for this signature in database
GPG Key ID: 19618CE9B2D4BE6D
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/nlohmann/detail/conversions/from_json.hpp
View File

@ -117,6 +117,7 @@ template <
typename BasicJsonType, typename StringType, typename BasicJsonType, typename StringType,
enable_if_t < enable_if_t <
std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
&& is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
&& !std::is_same<typename BasicJsonType::string_t, StringType>::value && !std::is_same<typename BasicJsonType::string_t, StringType>::value
&& !is_json_ref<StringType>::value, int > = 0 > && !is_json_ref<StringType>::value, int > = 0 >
inline void from_json(const BasicJsonType& j, StringType& s) inline void from_json(const BasicJsonType& j, StringType& s)

1
single_include/nlohmann/json.hpp
View File

@ -4480,6 +4480,7 @@ template <
typename BasicJsonType, typename StringType, typename BasicJsonType, typename StringType,
enable_if_t < enable_if_t <
std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
&& is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
&& !std::is_same<typename BasicJsonType::string_t, StringType>::value && !std::is_same<typename BasicJsonType::string_t, StringType>::value
&& !is_json_ref<StringType>::value, int > = 0 > && !is_json_ref<StringType>::value, int > = 0 >
inline void from_json(const BasicJsonType& j, StringType& s) inline void from_json(const BasicJsonType& j, StringType& s)