luo980/json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source 
Make our intent more clear in destruction
This commit is contained in:
Isaac Nickaein 2019-11-12 22:24:11 +03:30
parent 0f3ec003bb
commit 948f98cf4a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nlohmann/json.hpp
View File

@ -1035,9 +1035,12 @@ class basic_json
{ {
stack.push_back(std::move(it.second)); stack.push_back(std::move(it.second));
} }
current_item.m_value.object->clear();
} }
// current_item is destroyed here // it's now safe that current_item get destructed
// since it doesn't have any children
} }
switch (t) switch (t)

5
single_include/nlohmann/json.hpp
View File

@ -15578,9 +15578,12 @@ class basic_json
{ {
stack.push_back(std::move(it.second)); stack.push_back(std::move(it.second));
} }
current_item.m_value.object->clear();
} }
// current_item is destroyed here // it's now safe that current_item get destructed
// since it doesn't have any children
} }
switch (t) switch (t)