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

correctly constrain basic_json udt constructor

Browse source
This commit is contained in:
Théo DELRIEU 2016-11-21 10:17:26 +01:00
parent 0d91113ccf
commit e2dbe7a69f
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/json.hpp
View file

@ -512,7 +512,7 @@ class basic_json
/// workaround type for MSVC /// workaround type for MSVC
using basic_json_t = basic_json<ObjectType, ArrayType, StringType, using basic_json_t = basic_json<ObjectType, ArrayType, StringType,
BooleanType, NumberIntegerType, NumberUnsignedType, NumberFloatType, BooleanType, NumberIntegerType, NumberUnsignedType, NumberFloatType,
AllocatorType>; AllocatorType, JSONSerializer>;
public: public:
// forward declarations // forward declarations
@ -1565,15 +1565,19 @@ class basic_json
} }
// constructor chosen when JSONSerializer::to_json exists for type T // constructor chosen when JSONSerializer::to_json exists for type T
template <typename T, enable_if_t<detail::has_to_json< template <typename T, enable_if_t<detail::conjunction<detail::negation<std::is_same<uncvref_t<T>, basic_json_t>>,
JSONSerializer, basic_json, uncvref_t<T>>::value and not (detail::is_compatible_object_type<object_t, uncvref_t<T>>::value or detail::negation<detail::disjunction<
detail::is_compatible_array_type<basic_json_t, uncvref_t<T>>::value or detail::is_compatible_array_type<basic_json_t, uncvref_t<T>>,
detail::is_compatible_float_type<number_float_t, uncvref_t<T>>::value or detail::is_compatible_object_type<object_t, uncvref_t<T>>,
detail::is_compatible_integer_type<number_integer_t, uncvref_t<T>>::value or detail::is_compatible_float_type<number_float_t, uncvref_t<T>>,
detail::is_compatible_unsigned_integer_type<number_unsigned_t, uncvref_t<T>>::value or detail::is_compatible_integer_type<number_integer_t, uncvref_t<T>>,
std::is_constructible<string_t, uncvref_t<T>>::value or detail::is_compatible_unsigned_integer_type<number_unsigned_t, uncvref_t<T>>,
std::is_base_of<std::istream, uncvref_t<T>>::value or std::is_constructible<string_t, uncvref_t<T>>,
std::is_same<boolean_t, uncvref_t<T>>::value), int> = 0> std::is_base_of<std::istream, uncvref_t<T>>,
std::is_same<boolean_t, uncvref_t<T>>>>,
detail::has_to_json<
JSONSerializer, basic_json, uncvref_t<T>>
>::value, int> = 0>
explicit basic_json(T &&val) explicit basic_json(T &&val)
{ {
JSONSerializer<uncvref_t<T>>::to_json(*this, std::forward<T>(val)); JSONSerializer<uncvref_t<T>>::to_json(*this, std::forward<T>(val));