Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
848927ae
Commit
848927ae
authored
Jan 23, 2021
by
Anthony VH
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated comments as requested.
parent
6eb37e9b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
include/nlohmann/adl_serializer.hpp
include/nlohmann/adl_serializer.hpp
+2
-2
include/nlohmann/detail/meta/type_traits.hpp
include/nlohmann/detail/meta/type_traits.hpp
+1
-0
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+3
-2
test/src/unit-regression2.cpp
test/src/unit-regression2.cpp
+1
-0
No files found.
include/nlohmann/adl_serializer.hpp
View file @
848927ae
...
...
@@ -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
...
...
include/nlohmann/detail/meta/type_traits.hpp
View file @
848927ae
...
...
@@ -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
{
};
...
...
single_include/nlohmann/json.hpp
View file @
848927ae
...
...
@@ -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
...
...
test/src/unit-regression2.cpp
View file @
848927ae
...
...
@@ -136,6 +136,7 @@ struct NotSerializableData
/////////////////////////////////////////////////////////////////////
// for #2574
/////////////////////////////////////////////////////////////////////
struct
NonDefaultConstructible
{
explicit
NonDefaultConstructible
(
int
x
)
:
x
(
x
)
{
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment