1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00

Merge branch 'develop' into feature/sax2

This commit is contained in:
Niels Lohmann
2018-03-10 11:07:36 +01:00
2 changed files with 6 additions and 6 deletions

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

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