diff --git a/include/nlohmann/adl_serializer.hpp b/include/nlohmann/adl_serializer.hpp index 1dee29eb9..f967612db 100644 --- a/include/nlohmann/adl_serializer.hpp +++ b/include/nlohmann/adl_serializer.hpp @@ -20,7 +20,7 @@ struct adl_serializer This function is usually called by the `get()` function of the @ref basic_json class (either explicit or via conversion operators). - @note This function is chosen for value types which can be default constructed. + @note This function is chosen for default-constructible value types. @param[in] j JSON value to read from @param[in,out] val value to write to @@ -39,7 +39,7 @@ struct adl_serializer This function is usually called by the `get()` function of the @ref basic_json class (either explicit or via conversion operators). - @note This function is chosen for value types which can not be default constructed. + @note This function is chosen for value types which are not default-constructible. @param[in] j JSON value to read from diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index 1fbf7cde7..631829d07 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -149,6 +149,7 @@ struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> /////////////////// // is_ functions // /////////////////// + // https://en.cppreference.com/w/cpp/types/conjunction template struct conjunction : std::true_type { }; template struct conjunction : B1 { }; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 7ce313829..79c822d55 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -3185,6 +3185,7 @@ struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> /////////////////// // is_ functions // /////////////////// + // https://en.cppreference.com/w/cpp/types/conjunction template struct conjunction : std::true_type { }; template struct conjunction : B1 { }; @@ -4568,7 +4569,7 @@ struct adl_serializer This function is usually called by the `get()` function of the @ref basic_json class (either explicit or via conversion operators). - @note This function is chosen for value types which can be default constructed. + @note This function is chosen for default-constructible value types. @param[in] j JSON value to read from @param[in,out] val value to write to @@ -4587,7 +4588,7 @@ struct adl_serializer This function is usually called by the `get()` function of the @ref basic_json class (either explicit or via conversion operators). - @note This function is chosen for value types which can not be default constructed. + @note This function is chosen for value types which are not default-constructible. @param[in] j JSON value to read from diff --git a/test/src/unit-regression2.cpp b/test/src/unit-regression2.cpp index e31296fac..5a3de09d2 100644 --- a/test/src/unit-regression2.cpp +++ b/test/src/unit-regression2.cpp @@ -136,6 +136,7 @@ struct NotSerializableData ///////////////////////////////////////////////////////////////////// // for #2574 ///////////////////////////////////////////////////////////////////// + struct NonDefaultConstructible { explicit NonDefaultConstructible (int x) : x(x) { }