External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated comments as requested.

Browse Source
This commit is contained in:
Anthony VH 2021-01-23 18:24:47 +01:00
parent 6eb37e9b78
commit 848927ae90
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nlohmann/adl_serializer.hpp
View File

@ -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

1
include/nlohmann/detail/meta/type_traits.hpp
View File

@ -149,6 +149,7 @@ struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
///////////////////
// is_ functions //
///////////////////
// https://en.cppreference.com/w/cpp/types/conjunction
template<class...> struct conjunction : std::true_type { };
template<class B1> struct conjunction<B1> : B1 { };

5
single_include/nlohmann/json.hpp
View File

@ -3185,6 +3185,7 @@ struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
///////////////////
// is_ functions //
///////////////////
// https://en.cppreference.com/w/cpp/types/conjunction
template<class...> struct conjunction : std::true_type { };
template<class B1> struct conjunction<B1> : 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

1
test/src/unit-regression2.cpp
View File

@ -136,6 +136,7 @@ struct NotSerializableData
/////////////////////////////////////////////////////////////////////
// for #2574
/////////////////////////////////////////////////////////////////////
struct NonDefaultConstructible
{
explicit NonDefaultConstructible (int x) : x(x) { }