amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-03-02 15:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types

Browse Source 
fix sfinae on basic_json UDT constructor
This commit is contained in:
Niels Lohmann
2018-01-23 07:32:06 +01:00
committed by GitHub
parent 7eabb6ba36 dcee778c1e
commit f5c4e9f3a1
4 changed files with 83 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
develop/json.hpp
View File

@@ -1551,15 +1551,13 @@ class basic_json
@since version 2.1.0
*/
template<typename CompatibleType, typename U = detail::uncvref_t<CompatibleType>,
detail::enable_if_t<not std::is_base_of<std::istream, U>::value and
not std::is_same<U, basic_json_t>::value and
not detail::is_basic_json_nested_type<
basic_json_t, U>::value and
detail::has_to_json<basic_json, U>::value,
int> = 0>
basic_json(CompatibleType && val) noexcept(noexcept(JSONSerializer<U>::to_json(
std::declval<basic_json_t&>(), std::forward<CompatibleType>(val))))
template <typename CompatibleType,
typename U = detail::uncvref_t<CompatibleType>,
detail::enable_if_t<
detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
basic_json(CompatibleType && val) noexcept(noexcept(
JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
std::forward<CompatibleType>(val))))
{
JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
assert_invariant();