Skip to content

J
json
Unverified Commit 8cee0e38 by Niels Lohmann
Options

🚑 fixed #1319

parent 856fc31d
Showing with 8 additions and 18 deletions
include/nlohmann/detail/meta/type_traits.hpp
...@@ -191,15 +191,10 @@ struct is_constructible_object_type_impl < ...@@ -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>
......
single_include/nlohmann/json.hpp
...@@ -582,15 +582,10 @@ struct is_constructible_object_type_impl < ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment