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
04a0a071
Unverified
Commit
04a0a071
authored
4 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix move constructor and move assignment
parent
0617bd24
develop
bon8
coverity_scan
gcc_warning_flags
icpc
issue2932
issue3232_use_catch
master
release/3.10.2
release/3.10.3
release/3.10.4
release/3.10.5
string_view
string_view2
update_doctest
v3.10.5
v3.10.4
v3.10.3
v3.10.2
v3.10.1
v3.10.0
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
19 deletions
+0
-19
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+0
-13
single_include/nlohmann/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
...
@@ -2185,9 +2185,6 @@ class basic_json
basic_json
(
basic_json
&&
other
)
noexcept
basic_json
(
basic_json
&&
other
)
noexcept
:
m_type
(
std
::
move
(
other
.
m_type
)),
:
m_type
(
std
::
move
(
other
.
m_type
)),
m_value
(
std
::
move
(
other
.
m_value
))
m_value
(
std
::
move
(
other
.
m_value
))
#if JSON_DIAGNOSTICS
,
m_parent
(
other
.
m_parent
)
#endif
{
{
// check that passed value is valid
// check that passed value is valid
other
.
assert_invariant
();
other
.
assert_invariant
();
...
@@ -2261,9 +2258,6 @@ class basic_json
...
@@ -2261,9 +2258,6 @@ class basic_json
using
std
::
swap
;
using
std
::
swap
;
swap
(
m_type
,
other
.
m_type
);
swap
(
m_type
,
other
.
m_type
);
swap
(
m_value
,
other
.
m_value
);
swap
(
m_value
,
other
.
m_value
);
#if JSON_DIAGNOSTICS
m_parent
=
other
.
m_parent
;
#endif
assert_invariant
();
assert_invariant
();
return
*
this
;
return
*
this
;
...
@@ -3659,13 +3653,6 @@ class basic_json
...
@@ -3659,13 +3653,6 @@ class basic_json
// fill up array with null values if given idx is outside range
// fill up array with null values if given idx is outside range
if
(
idx
>=
m_value
.
array
->
size
())
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
#if JSON_DIAGNOSTICS
// set parent for values added above
// set parent for values added above
for
(
auto
i
=
previous_size
;
i
<=
idx
;
++
i
)
for
(
auto
i
=
previous_size
;
i
<=
idx
;
++
i
)
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
04a0a071
...
@@ -18821,9 +18821,6 @@ class basic_json
...
@@ -18821,9 +18821,6 @@ class basic_json
basic_json
(
basic_json
&&
other
)
noexcept
basic_json
(
basic_json
&&
other
)
noexcept
:
m_type
(
std
::
move
(
other
.
m_type
)),
:
m_type
(
std
::
move
(
other
.
m_type
)),
m_value
(
std
::
move
(
other
.
m_value
))
m_value
(
std
::
move
(
other
.
m_value
))
#if JSON_DIAGNOSTICS
,
m_parent
(
other
.
m_parent
)
#endif
{
{
// check that passed value is valid
// check that passed value is valid
other
.
assert_invariant
();
other
.
assert_invariant
();
...
@@ -18897,9 +18894,6 @@ class basic_json
...
@@ -18897,9 +18894,6 @@ class basic_json
using
std
::
swap
;
using
std
::
swap
;
swap
(
m_type
,
other
.
m_type
);
swap
(
m_type
,
other
.
m_type
);
swap
(
m_value
,
other
.
m_value
);
swap
(
m_value
,
other
.
m_value
);
#if JSON_DIAGNOSTICS
m_parent
=
other
.
m_parent
;
#endif
assert_invariant
();
assert_invariant
();
return
*
this
;
return
*
this
;
...
...
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