amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-25 07:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5901 fixes

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-24 18:59:12 +02:00
2 parents 8085a8f5ec 2852427b3f
commit 3b632e489a
2 files changed
+4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/input/json_sax.hpp
+2
View File
@@ -937,6 +937,8 @@ class json_sax_dom_parser : public json_sax_dom_error_state
/// directly if the value was the one too many. /// directly if the value was the one too many.
void place_container(const frame& f, frame* enclosing, BasicJsonType&& value, const bool enclosing_is_innermost) void place_container(const frame& f, frame* enclosing, BasicJsonType&& value, const bool enclosing_is_innermost)
{ {
// only a container with a slot may have no enclosing container
JSON_ASSERT(f.slot != nullptr || enclosing != nullptr);
if (f.slot != nullptr) if (f.slot != nullptr)
{ {
*f.slot = std::move(value); *f.slot = std::move(value);
single_include/nlohmann/json.hpp
Generated
+2
View File
@@ -16060,6 +16060,8 @@ class json_sax_dom_parser : public json_sax_dom_error_state
/// directly if the value was the one too many. /// directly if the value was the one too many.
void place_container(const frame& f, frame* enclosing, BasicJsonType&& value, const bool enclosing_is_innermost) void place_container(const frame& f, frame* enclosing, BasicJsonType&& value, const bool enclosing_is_innermost)
{ {
// only a container with a slot may have no enclosing container
JSON_ASSERT(f.slot != nullptr || enclosing != nullptr);
if (f.slot != nullptr) if (f.slot != nullptr)
{ {
*f.slot = std::move(value); *f.slot = std::move(value);