diff --git a/develop/detail/meta.hpp b/develop/detail/meta.hpp index bea42a07..585b8d44 100644 --- a/develop/detail/meta.hpp +++ b/develop/detail/meta.hpp @@ -96,6 +96,14 @@ template<> struct priority_tag<0> {}; // has_/is_ functions // //////////////////////// +// source: https://stackoverflow.com/a/37193089/4116453 + +template +struct is_complete_type : std::false_type {}; + +template +struct is_complete_type : std::true_type {}; + NLOHMANN_JSON_HAS_HELPER(mapped_type); NLOHMANN_JSON_HAS_HELPER(key_type); NLOHMANN_JSON_HAS_HELPER(value_type); @@ -171,7 +179,6 @@ struct is_compatible_integer_type RealIntegerType, CompatibleNumberIntegerType > ::value; }; - // trait checking if JSONSerializer::from_json(json const&, udt&) exists template struct has_from_json @@ -221,6 +228,23 @@ struct has_to_json std::declval>()))>::value; }; +template +struct is_compatible_complete_type +{ + static constexpr bool value = + not std::is_base_of::value and + not std::is_same::value and + not is_basic_json_nested_type::value and + has_to_json::value; +}; + +template +struct is_compatible_type + : conjunction, + is_compatible_complete_type> +{ +}; + // taken from ranges-v3 template struct static_const diff --git a/develop/json.hpp b/develop/json.hpp index f4c139e4..26a2b111 100644 --- a/develop/json.hpp +++ b/develop/json.hpp @@ -1551,15 +1551,13 @@ class basic_json @since version 2.1.0 */ - template, - detail::enable_if_t::value and - not std::is_same::value and - not detail::is_basic_json_nested_type< - basic_json_t, U>::value and - detail::has_to_json::value, - int> = 0> - basic_json(CompatibleType && val) noexcept(noexcept(JSONSerializer::to_json( - std::declval(), std::forward(val)))) + template , + detail::enable_if_t< + detail::is_compatible_type::value, int> = 0> + basic_json(CompatibleType && val) noexcept(noexcept( + JSONSerializer::to_json(std::declval(), + std::forward(val)))) { JSONSerializer::to_json(*this, std::forward(val)); assert_invariant(); diff --git a/src/json.hpp b/src/json.hpp index a80cc36a..d95ae8db 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -312,6 +312,14 @@ template<> struct priority_tag<0> {}; // has_/is_ functions // //////////////////////// +// source: https://stackoverflow.com/a/37193089/4116453 + +template +struct is_complete_type : std::false_type {}; + +template +struct is_complete_type : std::true_type {}; + NLOHMANN_JSON_HAS_HELPER(mapped_type); NLOHMANN_JSON_HAS_HELPER(key_type); NLOHMANN_JSON_HAS_HELPER(value_type); @@ -387,7 +395,6 @@ struct is_compatible_integer_type RealIntegerType, CompatibleNumberIntegerType > ::value; }; - // trait checking if JSONSerializer::from_json(json const&, udt&) exists template struct has_from_json @@ -437,6 +444,23 @@ struct has_to_json std::declval>()))>::value; }; +template +struct is_compatible_complete_type +{ + static constexpr bool value = + not std::is_base_of::value and + not std::is_same::value and + not is_basic_json_nested_type::value and + has_to_json::value; +}; + +template +struct is_compatible_type + : conjunction, + is_compatible_complete_type> +{ +}; + // taken from ranges-v3 template struct static_const @@ -8839,15 +8863,13 @@ class basic_json @since version 2.1.0 */ - template, - detail::enable_if_t::value and - not std::is_same::value and - not detail::is_basic_json_nested_type< - basic_json_t, U>::value and - detail::has_to_json::value, - int> = 0> - basic_json(CompatibleType && val) noexcept(noexcept(JSONSerializer::to_json( - std::declval(), std::forward(val)))) + template , + detail::enable_if_t< + detail::is_compatible_type::value, int> = 0> + basic_json(CompatibleType && val) noexcept(noexcept( + JSONSerializer::to_json(std::declval(), + std::forward(val)))) { JSONSerializer::to_json(*this, std::forward(val)); assert_invariant(); diff --git a/test/src/unit-udt.cpp b/test/src/unit-udt.cpp index 4fd6f7ec..a4adc3be 100644 --- a/test/src/unit-udt.cpp +++ b/test/src/unit-udt.cpp @@ -692,3 +692,22 @@ TEST_CASE("custom serializer that does adl by default", "[udt]") CHECK(me == j.get()); CHECK(me == cj.get()); } + +namespace +{ +struct incomplete; + +// std::is_constructible is broken on macOS' libc++ +// use the cppreference implementation + +template +struct is_constructible_patched : std::false_type {}; + +template +struct is_constructible_patched())))> : std::true_type {}; +} + +TEST_CASE("an incomplete type does not trigger a compiler error in non-evaluated context", "[udt]") +{ + static_assert(not is_constructible_patched::value, ""); +}