From 7e149d055878b42e7e67710be3b5639a84d104c3 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 5 Dec 2025 23:29:00 -0500 Subject: [PATCH] xo-ordinaltree: minor tidy --- xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp | 6 +++--- .../include/xo/ordinaltree/rbtree/RbTreeUtil.hpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp b/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp index f6938b2e..ed293cd2 100644 --- a/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp +++ b/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp @@ -291,9 +291,9 @@ namespace xo { void assign_color(Color x) { this->color_ = x; } void assign_size(size_t z) { this->size_ = z; } - void _assign_contents(const Value & x) { contents_.second = x; } - Node * const * _parent_addr() const { return &parent_; } - Node * const * _child_addr(Direction d) const { return &child_v_[d]; } + void assign_contents(const Value & x) { this->contents_.second = x; } + Node * const * parent_addr() const { return &parent_; } + Node * const * child_addr(Direction d) const { return &child_v_[d]; } /* recalculate size from immediate childrens' sizes * editor bait: recalc_local_size() diff --git a/xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp b/xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp index 8dd516c2..6aab30e5 100644 --- a/xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp +++ b/xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp @@ -808,7 +808,7 @@ namespace xo { /* match on this key already present in tree * -> just update assoc'd value */ - N->_assign_contents(kv_pair.second); + N->assign_contents(kv_pair.second); } /* after modifying a node n, must recalculate reductions @@ -856,7 +856,7 @@ namespace xo { const void * src = N; const void * const * lhs - = reinterpret_cast(N->_child_addr(Direction::D_Left)); + = reinterpret_cast(N->child_addr(Direction::D_Left)); XO_EXPECT(gc.check_write_barrier(src, lhs, false), tostr("RbTreeUtil::insert_aux", @@ -1736,7 +1736,7 @@ namespace xo { if (x->parent()) { const void * src = x; - const void * const * lhs = reinterpret_cast(x->_parent_addr()); + const void * const * lhs = reinterpret_cast(x->parent_addr()); XO_EXPECT(gc.check_write_barrier(src, lhs, false), tostr(c_self, (": expect mlog entry for xgen parent pointer"), @@ -1757,7 +1757,7 @@ namespace xo { { const void * parent = x; - const void * const * lhs = reinterpret_cast(x->_child_addr(detail::Direction(0))); + const void * const * lhs = reinterpret_cast(x->child_addr(detail::Direction(0))); XO_EXPECT(gc.check_write_barrier(parent, lhs, false), tostr(c_self, (": expect mlog entry for xgen left child pointer"), @@ -1790,7 +1790,7 @@ namespace xo { { const void * parent = x; const void * const * lhs - = reinterpret_cast(x->_child_addr(Direction::D_Right)); + = reinterpret_cast(x->child_addr(Direction::D_Right)); XO_EXPECT(gc.check_write_barrier(parent, lhs, false), tostr(c_self, (": expect mlog entry for xgen right child pointer"),