From 4d2bc7f2458d5bcb924ae596ed3fa6e5413cc66f Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 1 Dec 2025 14:33:41 -0500 Subject: [PATCH] xo-ordinaltree: use gc_allocator_traits --- xo-ordinaltree/include/xo/ordinaltree/BplusTree.hpp | 4 ++-- xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp | 6 +++--- xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp | 2 +- xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xo-ordinaltree/include/xo/ordinaltree/BplusTree.hpp b/xo-ordinaltree/include/xo/ordinaltree/BplusTree.hpp index 7810a031..a2651ba0 100644 --- a/xo-ordinaltree/include/xo/ordinaltree/BplusTree.hpp +++ b/xo-ordinaltree/include/xo/ordinaltree/BplusTree.hpp @@ -278,8 +278,8 @@ namespace xo { // allocator_type using reference = value_type &; using const_reference = value_type const &; - // pointer = std::allocator_traits::pointer; - // const_pointer = std::allocator_traits::const_pointer; + // pointer = xo::gc::gc_allocator_traits::pointer; + // const_pointer = xo::gc::gc_allocator_traits::const_pointer; using const_iterator = detail::ConstIterator; // reverse_iterator // const_reverse_iterator diff --git a/xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp b/xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp index 45313af2..a46a222c 100644 --- a/xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp +++ b/xo-ordinaltree/include/xo/ordinaltree/RedBlackTree.hpp @@ -109,7 +109,7 @@ namespace xo { using value_type = std::pair; // using key_compare = Compare // not yet using allocator_type = Allocator; - using allocator_traits = std::allocator_traits; + using allocator_traits = xo::gc::gc_allocator_traits; using ReducedValue = typename Reduce::value_type; using RbUtil = detail::RbTreeUtil; @@ -118,8 +118,8 @@ namespace xo { using RbTreeConstLhs = detail::RedBlackTreeConstLhs; using node_type = RbNode; - using node_allocator_type = typename std::allocator_traits::template rebind_alloc; - using node_allocator_traits = std::allocator_traits; + using node_allocator_type = typename xo::gc::gc_allocator_traits::template rebind_alloc; + using node_allocator_traits = xo::gc::gc_allocator_traits; using Direction = detail::Direction; using size_type = std::size_t; diff --git a/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp b/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp index acf55fec..90ae2dec 100644 --- a/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp +++ b/xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp @@ -47,7 +47,7 @@ namespace xo { static Node * make_leaf(NodeAllocator& alloc, value_type const & kv_pair, ReducedValue const & leaf_rv) { - using traits = std::allocator_traits; + using traits = xo::gc::gc_allocator_traits; // get memory Node * node = traits::allocate(alloc, 1); diff --git a/xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp b/xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp index 1d96031d..830bdecf 100644 --- a/xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp +++ b/xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp @@ -896,7 +896,7 @@ namespace xo { using xo::xtag; using xo::print::ccs; - using traits = std::allocator_traits; + using traits = xo::gc::gc_allocator_traits; //constexpr char const *c_self = "RbTreeUtil::remove_black_leaf"; @@ -1565,7 +1565,7 @@ namespace xo { scope log(XO_DEBUG(debug_flag)); - using traits = std::allocator_traits; + using traits = xo::gc::gc_allocator_traits; RbNode * P = N->parent();