amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-30 09:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not check for compatible_object_type in compatible_array_type

Browse Source
This commit is contained in:
Théo DELRIEU committed 2018-09-07 12:18:03 +02:00
1 parent 29f72966c3
commit 628f76729e
2 files changed
+10 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/conversions/to_json.hpp
+5 -3
View File
@@ -248,9 +248,11 @@ void to_json(BasicJsonType& j, const std::vector<bool>& e)
external_constructor<value_t::array>::construct(j, e); external_constructor<value_t::array>::construct(j, e);
} }
template<typename BasicJsonType, typename CompatibleArrayType, template <typename BasicJsonType, typename CompatibleArrayType,
enable_if_t<is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value or enable_if_t<is_compatible_array_type<BasicJsonType,
std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value, CompatibleArrayType>::value and
not is_compatible_object_type<
BasicJsonType, CompatibleArrayType>::value,
int> = 0> int> = 0>
void to_json(BasicJsonType& j, const CompatibleArrayType& arr) void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
{ {
single_include/nlohmann/json.hpp
+5 -3
View File
@@ -1769,9 +1769,11 @@ void to_json(BasicJsonType& j, const std::vector<bool>& e)
external_constructor<value_t::array>::construct(j, e); external_constructor<value_t::array>::construct(j, e);
} }
template<typename BasicJsonType, typename CompatibleArrayType, template <typename BasicJsonType, typename CompatibleArrayType,
enable_if_t<is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value or enable_if_t<is_compatible_array_type<BasicJsonType,
std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value, CompatibleArrayType>::value and
not is_compatible_object_type<
BasicJsonType, CompatibleArrayType>::value,
int> = 0> int> = 0>
void to_json(BasicJsonType& j, const CompatibleArrayType& arr) void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
{ {