wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-14 19:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/sax2

Browse Source
This commit is contained in:
Niels Lohmann committed 2018-03-10 11:07:36 +01:00
2 parents 35e43df625 6151dfaed7
commit 6399cd3039
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/json.hpp
+3 -3
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
single_include/nlohmann/json.hpp
+3 -3
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