j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into feature/sax2

Browse source
This commit is contained in:
Niels Lohmann 2018-03-10 11:07:36 +01:00
commit 6399cd3039
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/nlohmann/json.hpp
View file

@ -955,7 +955,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
@ -967,7 +967,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
@ -979,7 +979,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

6
single_include/nlohmann/json.hpp
View file

@ -11019,7 +11019,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
@ -11031,7 +11031,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
@ -11043,7 +11043,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