j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

👌 replaced static_cast to CharType by conversion function #1286

Browse source
This commit is contained in:
Niels Lohmann 2018-10-23 17:49:04 +02:00
parent 9294e25c98
commit b49f76931f
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 212 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/nlohmann/detail/meta/type_traits.hpp
View file

@ -193,13 +193,13 @@ struct is_constructible_object_type_impl <
static constexpr bool value =
std::is_constructible<typename ConstructibleObjectType::key_type,
typename object_t::key_type>::value and
std::is_same<typename object_t::mapped_type,
typename ConstructibleObjectType::mapped_type>::value or
(has_from_json<BasicJsonType,
(std::is_same<typename object_t::mapped_type,
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>