diff --git a/include/nlohmann/detail/view/serializer.hpp b/include/nlohmann/detail/view/serializer.hpp index 3dc007bff..01d9286c6 100644 --- a/include/nlohmann/detail/view/serializer.hpp +++ b/include/nlohmann/detail/view/serializer.hpp @@ -354,11 +354,11 @@ template struct depth_counter { std::size_t value = 0; - void open() noexcept + void enter() noexcept { ++value; } - std::size_t close() noexcept + std::size_t leave() noexcept { return --value; } @@ -371,8 +371,8 @@ struct depth_counter template<> struct depth_counter { - void open() noexcept {} - std::size_t close() noexcept + void enter() noexcept {} + std::size_t leave() noexcept { return 0; } @@ -881,7 +881,7 @@ class view_serializer { *w++ = object ? '{' : '['; stack.push_back(cur); - level.open(); + level.enter(); if (Editable) { cur = frame{nav::first(m_doc, n), nav::end(m_doc, n), object}; @@ -926,7 +926,7 @@ class view_serializer } if (Pretty) { - newline(level.close()); + newline(level.leave()); } room(1); *w++ = cur.object ? '}' : ']'; diff --git a/single_include/nlohmann/json_view.hpp b/single_include/nlohmann/json_view.hpp index a80dabd60..f3f3ad8ef 100644 --- a/single_include/nlohmann/json_view.hpp +++ b/single_include/nlohmann/json_view.hpp @@ -6421,11 +6421,11 @@ template struct depth_counter { std::size_t value = 0; - void open() noexcept + void enter() noexcept { ++value; } - std::size_t close() noexcept + std::size_t leave() noexcept { return --value; } @@ -6438,8 +6438,8 @@ struct depth_counter template<> struct depth_counter { - void open() noexcept {} - std::size_t close() noexcept + void enter() noexcept {} + std::size_t leave() noexcept { return 0; } @@ -6948,7 +6948,7 @@ class view_serializer { *w++ = object ? '{' : '['; stack.push_back(cur); - level.open(); + level.enter(); if (Editable) { cur = frame{nav::first(m_doc, n), nav::end(m_doc, n), object}; @@ -6993,7 +6993,7 @@ class view_serializer } if (Pretty) { - newline(level.close()); + newline(level.leave()); } room(1); *w++ = cur.object ? '}' : ']';