Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
04a0a071
Unverified
Commit
04a0a071
authored
Jan 08, 2021
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
👌
fix move constructor and move assignment
parent
0617bd24
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
19 deletions
+0
-19
json.hpp
include/nlohmann/json.hpp
+0
-13
json.hpp
single_include/nlohmann/json.hpp
+0
-6
No files found.
include/nlohmann/json.hpp
View file @
04a0a071
...
...
@@ -2185,9 +2185,6 @@ class basic_json
basic_json
(
basic_json
&&
other
)
noexcept
:
m_type
(
std
::
move
(
other
.
m_type
)),
m_value
(
std
::
move
(
other
.
m_value
))
#if JSON_DIAGNOSTICS
,
m_parent
(
other
.
m_parent
)
#endif
{
// check that passed value is valid
other
.
assert_invariant
();
...
...
@@ -2261,9 +2258,6 @@ class basic_json
using
std
::
swap
;
swap
(
m_type
,
other
.
m_type
);
swap
(
m_value
,
other
.
m_value
);
#if JSON_DIAGNOSTICS
m_parent
=
other
.
m_parent
;
#endif
assert_invariant
();
return
*
this
;
...
...
@@ -3660,13 +3654,6 @@ class basic_json
if
(
idx
>=
m_value
.
array
->
size
())
{
#if JSON_DIAGNOSTICS
// remember array size before resizing
const
auto
previous_size
=
m_value
.
array
->
size
();
#endif
m_value
.
array
->
resize
(
idx
+
1
);
#if JSON_DIAGNOSTICS
// set parent for values added above
for
(
auto
i
=
previous_size
;
i
<=
idx
;
++
i
)
{
...
...
single_include/nlohmann/json.hpp
View file @
04a0a071
...
...
@@ -18821,9 +18821,6 @@ class basic_json
basic_json
(
basic_json
&&
other
)
noexcept
:
m_type
(
std
::
move
(
other
.
m_type
)),
m_value
(
std
::
move
(
other
.
m_value
))
#if JSON_DIAGNOSTICS
,
m_parent
(
other
.
m_parent
)
#endif
{
// check that passed value is valid
other
.
assert_invariant
();
...
...
@@ -18897,9 +18894,6 @@ class basic_json
using
std
::
swap
;
swap
(
m_type
,
other
.
m_type
);
swap
(
m_value
,
other
.
m_value
);
#if JSON_DIAGNOSTICS
m_parent
=
other
.
m_parent
;
#endif
assert_invariant
();
return
*
this
;
...
...
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