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
6b267e3c
Commit
6b267e3c
authored
4 years ago
by
David Pfahler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed amalgation file for #2730
parent
38952643
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+2
-2
No files found.
single_include/nlohmann/json.hpp
View file @
6b267e3c
...
@@ -17097,7 +17097,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
...
@@ -17097,7 +17097,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
detail
::
parser_callback_t
<
basic_json
>
cb
=
nullptr
,
detail
::
parser_callback_t
<
basic_json
>
cb
=
nullptr
,
const
bool
allow_exceptions
=
true
,
const
bool
allow_exceptions
=
true
,
const
bool
ignore_comments
=
false
const
bool
ignore_comments
=
false
)
)
{
{
return
::
nlohmann
::
detail
::
parser
<
basic_json
,
InputAdapterType
>
(
std
::
move
(
adapter
),
return
::
nlohmann
::
detail
::
parser
<
basic_json
,
InputAdapterType
>
(
std
::
move
(
adapter
),
std
::
move
(
cb
),
allow_exceptions
,
ignore_comments
);
std
::
move
(
cb
),
allow_exceptions
,
ignore_comments
);
...
@@ -25751,7 +25751,7 @@ template<>
...
@@ -25751,7 +25751,7 @@ template<>
inline
void
swap
<
nlohmann
::
json
>
(
nlohmann
::
json
&
j1
,
nlohmann
::
json
&
j2
)
noexcept
(
// NOLINT(readability-inconsistent-declaration-parameter-name)
inline
void
swap
<
nlohmann
::
json
>
(
nlohmann
::
json
&
j1
,
nlohmann
::
json
&
j2
)
noexcept
(
// NOLINT(readability-inconsistent-declaration-parameter-name)
is_nothrow_move_constructible
<
nlohmann
::
json
>::
value
&&
// NOLINT(misc-redundant-expression)
is_nothrow_move_constructible
<
nlohmann
::
json
>::
value
&&
// NOLINT(misc-redundant-expression)
is_nothrow_move_assignable
<
nlohmann
::
json
>::
value
is_nothrow_move_assignable
<
nlohmann
::
json
>::
value
)
)
{
{
j1
.
swap
(
j2
);
j1
.
swap
(
j2
);
}
}
...
...
This diff is collapsed.
Click to expand it.
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