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
6151dfae
Unverified
Commit
6151dfae
authored
7 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
made changes proposed in #1001
parent
99185230
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
include/nlohmann/json.hpp
include/nlohmann/json.hpp
+3
-3
single_include/nlohmann/json.hpp
single_include/nlohmann/json.hpp
+3
-3
No files found.
include/nlohmann/json.hpp
View file @
6151dfae
...
@@ -953,7 +953,7 @@ class basic_json
...
@@ -953,7 +953,7 @@ class basic_json
/// constructor for rvalue strings
/// constructor for rvalue strings
json_value
(
string_t
&&
value
)
json_value
(
string_t
&&
value
)
{
{
string
=
create
<
string_t
>
(
std
::
forward
<
string_t
&&
>
(
value
));
string
=
create
<
string_t
>
(
std
::
move
(
value
));
}
}
/// constructor for objects
/// constructor for objects
...
@@ -965,7 +965,7 @@ class basic_json
...
@@ -965,7 +965,7 @@ class basic_json
/// constructor for rvalue objects
/// constructor for rvalue objects
json_value
(
object_t
&&
value
)
json_value
(
object_t
&&
value
)
{
{
object
=
create
<
object_t
>
(
std
::
forward
<
object_t
&&
>
(
value
));
object
=
create
<
object_t
>
(
std
::
move
(
value
));
}
}
/// constructor for arrays
/// constructor for arrays
...
@@ -977,7 +977,7 @@ class basic_json
...
@@ -977,7 +977,7 @@ class basic_json
/// constructor for rvalue arrays
/// constructor for rvalue arrays
json_value
(
array_t
&&
value
)
json_value
(
array_t
&&
value
)
{
{
array
=
create
<
array_t
>
(
std
::
forward
<
array_t
&&
>
(
value
));
array
=
create
<
array_t
>
(
std
::
move
(
value
));
}
}
void
destroy
(
value_t
t
)
noexcept
void
destroy
(
value_t
t
)
noexcept
...
...
This diff is collapsed.
Click to expand it.
single_include/nlohmann/json.hpp
View file @
6151dfae
...
@@ -10562,7 +10562,7 @@ class basic_json
...
@@ -10562,7 +10562,7 @@ class basic_json
/// constructor for rvalue strings
/// constructor for rvalue strings
json_value
(
string_t
&&
value
)
json_value
(
string_t
&&
value
)
{
{
string
=
create
<
string_t
>
(
std
::
forward
<
string_t
&&
>
(
value
));
string
=
create
<
string_t
>
(
std
::
move
(
value
));
}
}
/// constructor for objects
/// constructor for objects
...
@@ -10574,7 +10574,7 @@ class basic_json
...
@@ -10574,7 +10574,7 @@ class basic_json
/// constructor for rvalue objects
/// constructor for rvalue objects
json_value
(
object_t
&&
value
)
json_value
(
object_t
&&
value
)
{
{
object
=
create
<
object_t
>
(
std
::
forward
<
object_t
&&
>
(
value
));
object
=
create
<
object_t
>
(
std
::
move
(
value
));
}
}
/// constructor for arrays
/// constructor for arrays
...
@@ -10586,7 +10586,7 @@ class basic_json
...
@@ -10586,7 +10586,7 @@ class basic_json
/// constructor for rvalue arrays
/// constructor for rvalue arrays
json_value
(
array_t
&&
value
)
json_value
(
array_t
&&
value
)
{
{
array
=
create
<
array_t
>
(
std
::
forward
<
array_t
&&
>
(
value
));
array
=
create
<
array_t
>
(
std
::
move
(
value
));
}
}
void
destroy
(
value_t
t
)
noexcept
void
destroy
(
value_t
t
)
noexcept
...
...
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