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
fad14aab
Unverified
Commit
fad14aab
authored
Jul 25, 2020
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
📝
update output of meta function
parent
6e5be17b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
doc/examples/meta.output
doc/examples/meta.output
+2
-2
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+1
-1
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+3
-3
No files found.
doc/examples/meta.output
View file @
fad14aab
...
...
@@ -2,9 +2,9 @@
"compiler": {
"c++": "201103",
"family": "clang",
"version": "1
1.0.3 (clang-1103.0.32.62
)"
"version": "1
2.0.0 (clang-1200.0.22.19
)"
},
"copyright": "(C) 2013-20
17
Niels Lohmann",
"copyright": "(C) 2013-20
20
Niels Lohmann",
"name": "JSON for Modern C++",
"platform": "apple",
"url": "https://github.com/nlohmann/json",
...
...
include/nlohmann/json.hpp
View file @
fad14aab
...
...
@@ -344,7 +344,7 @@ class basic_json
{
basic_json
result
;
result
[
"copyright"
]
=
"(C) 2013-20
17
Niels Lohmann"
;
result
[
"copyright"
]
=
"(C) 2013-20
20
Niels Lohmann"
;
result
[
"name"
]
=
"JSON for Modern C++"
;
result
[
"url"
]
=
"https://github.com/nlohmann/json"
;
result
[
"version"
][
"string"
]
=
...
...
single_include/nlohmann/json.hpp
View file @
fad14aab
...
...
@@ -16501,7 +16501,7 @@ class basic_json
detail
::
parser_callback_t
<
basic_json
>
cb
=
nullptr
,
const
bool
allow_exceptions
=
true
,
const
bool
ignore_comments
=
false
)
)
{
return
::
nlohmann
::
detail
::
parser
<
basic_json
,
InputAdapterType
>
(
std
::
move
(
adapter
),
std
::
move
(
cb
),
allow_exceptions
,
ignore_comments
);
...
...
@@ -16647,7 +16647,7 @@ class basic_json
{
basic_json
result
;
result
[
"copyright"
]
=
"(C) 2013-20
17
Niels Lohmann"
;
result
[
"copyright"
]
=
"(C) 2013-20
20
Niels Lohmann"
;
result
[
"name"
]
=
"JSON for Modern C++"
;
result
[
"url"
]
=
"https://github.com/nlohmann/json"
;
result
[
"version"
][
"string"
]
=
...
...
@@ -25041,7 +25041,7 @@ template<>
inline
void
swap
<
nlohmann
::
json
>
(
nlohmann
::
json
&
j1
,
nlohmann
::
json
&
j2
)
noexcept
(
is_nothrow_move_constructible
<
nlohmann
::
json
>::
value
&&
is_nothrow_move_assignable
<
nlohmann
::
json
>::
value
)
)
{
j1
.
swap
(
j2
);
}
...
...
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