lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-29 23:01:16 +03:00
Code Activity

Merge branch 'develop' into feature/sax2

Browse Source
This commit is contained in:
Niels Lohmann
2018-03-09 21:56:30 +01:00
parent 7c1a788893 9918523077
commit 35e43df625
6 changed files with 92 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
single_include/nlohmann/json.hpp
View File

@ -3911,6 +3911,7 @@ class parser
if (keep and callback and not callback(depth, parse_event_t::value, result))
{
result.m_value.destroy(result.m_type);
result.m_type = value_t::discarded;
}
}
@ -11018,7 +11019,7 @@ class basic_json
/// constructor for rvalue strings
json_value(string_t&& value)
{
string = create<string_t>(std::move(value));
string = create<string_t>(std::forward < string_t&& > (value));
}
/// constructor for objects
@ -11030,7 +11031,7 @@ class basic_json
/// constructor for rvalue objects
json_value(object_t&& value)
{
object = create<object_t>(std::move(value));
object = create<object_t>(std::forward < object_t&& > (value));
}
/// constructor for arrays
@ -11042,7 +11043,7 @@ class basic_json
/// constructor for rvalue arrays
json_value(array_t&& value)
{
array = create<array_t>(std::move(value));
array = create<array_t>(std::forward < array_t&& > (value));
}
void destroy(value_t t) noexcept