mirror of
https://github.com/nlohmann/json.git
synced 2026-10-16 19:18:12 +00:00
Follow the renames from the review of the view builder
The review of #5620 renamed document_data's tape/tape_size/tape_cap to nodes/node_count/node_capacity and made the decode arena a std::vector<char>; adapt the code of this change to it. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
4 files changed
+9
-9
No files matched your search
Generated
+4
-4
@@ -3010,9 +3010,9 @@ inline node* block_of(document_data& d, node* n, std::size_t extra)
|
||||
inline node* find_parent(const document_data& d, const node* target)
|
||||
{
|
||||
const std::less<const node*> lt{};
|
||||
const node* lo = d.tape;
|
||||
const node* hi = d.tape + d.tape_size;
|
||||
const node* c = d.tape;
|
||||
const node* lo = d.nodes;
|
||||
const node* hi = d.nodes + d.node_count;
|
||||
const node* c = d.nodes;
|
||||
if (lt(target, lo) || !lt(target, hi))
|
||||
{
|
||||
if (!d.edits)
|
||||
@@ -3760,7 +3760,7 @@ class editor
|
||||
const std::uint8_t linked = slot->flags & node_flags::linked;
|
||||
if (e.region == nullptr)
|
||||
{
|
||||
if (is_container(*slot) && slot->next > 1 && slot != m_doc.tape && linked == 0)
|
||||
if (is_container(*slot) && slot->next > 1 && slot != m_doc.nodes && linked == 0)
|
||||
{
|
||||
// The slot spans its old elements in the enclosing sequence, but
|
||||
// a scalar is one node: the enclosing container first switches to
|
||||
|
||||
Reference in new issue
Block a user