mirror of
https://github.com/nlohmann/json
synced 2024-12-24 17:41:05 +00:00
🚑 fixed #1319
This commit is contained in:
parent
856fc31d0a
commit
8cee0e38d9
@ -191,15 +191,10 @@ struct is_constructible_object_type_impl <
|
|||||||
using object_t = typename BasicJsonType::object_t;
|
using object_t = typename BasicJsonType::object_t;
|
||||||
|
|
||||||
static constexpr bool value =
|
static constexpr bool value =
|
||||||
std::is_constructible<typename ConstructibleObjectType::key_type,
|
(std::is_constructible<typename ConstructibleObjectType::key_type, typename object_t::key_type>::value and
|
||||||
typename object_t::key_type>::value and
|
std::is_same<typename object_t::mapped_type, typename ConstructibleObjectType::mapped_type>::value) or
|
||||||
(std::is_same<typename object_t::mapped_type,
|
(has_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type>::value or
|
||||||
typename ConstructibleObjectType::mapped_type>::value or
|
has_non_default_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type >::value);
|
||||||
(has_from_json<BasicJsonType,
|
|
||||||
typename ConstructibleObjectType::mapped_type>::value or
|
|
||||||
has_non_default_from_json <
|
|
||||||
BasicJsonType,
|
|
||||||
typename ConstructibleObjectType::mapped_type >::value));
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename BasicJsonType, typename ConstructibleObjectType>
|
template <typename BasicJsonType, typename ConstructibleObjectType>
|
||||||
|
@ -582,15 +582,10 @@ struct is_constructible_object_type_impl <
|
|||||||
using object_t = typename BasicJsonType::object_t;
|
using object_t = typename BasicJsonType::object_t;
|
||||||
|
|
||||||
static constexpr bool value =
|
static constexpr bool value =
|
||||||
std::is_constructible<typename ConstructibleObjectType::key_type,
|
(std::is_constructible<typename ConstructibleObjectType::key_type, typename object_t::key_type>::value and
|
||||||
typename object_t::key_type>::value and
|
std::is_same<typename object_t::mapped_type, typename ConstructibleObjectType::mapped_type>::value) or
|
||||||
(std::is_same<typename object_t::mapped_type,
|
(has_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type>::value or
|
||||||
typename ConstructibleObjectType::mapped_type>::value or
|
has_non_default_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type >::value);
|
||||||
(has_from_json<BasicJsonType,
|
|
||||||
typename ConstructibleObjectType::mapped_type>::value or
|
|
||||||
has_non_default_from_json <
|
|
||||||
BasicJsonType,
|
|
||||||
typename ConstructibleObjectType::mapped_type >::value));
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template <typename BasicJsonType, typename ConstructibleObjectType>
|
template <typename BasicJsonType, typename ConstructibleObjectType>
|
||||||
|
Loading…
Reference in New Issue
Block a user