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

remove now-useless traits. check for is_basic_json where needed

Browse source
This commit is contained in:
Théo DELRIEU 2018-09-07 12:42:49 +02:00
parent 4b4bbceebf
commit aea648bb7a
No known key found for this signature in database
GPG key ID: 7D6E00D1DF01DEAF
4 changed files with 76 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/nlohmann/detail/conversions/to_json.hpp
View file

@ -253,7 +253,8 @@ template <typename BasicJsonType, typename CompatibleArrayType,
CompatibleArrayType>::value and
not is_compatible_object_type<
BasicJsonType, CompatibleArrayType>::value and
not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value,
not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value and
not is_basic_json<CompatibleArrayType>::value,
int> = 0>
void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
{
@ -274,7 +275,7 @@ void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
}
template<typename BasicJsonType, typename CompatibleObjectType,
enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value, int> = 0>
enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value and not is_basic_json<CompatibleObjectType>::value, int> = 0>
void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
{
external_constructor<value_t::object>::construct(j, obj);