From 99e5032b1ed346c351fd46d58bdf9d8cefeed7d4 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Fri, 1 May 2026 19:54:26 -0400
Subject: [PATCH] refactor focusing on xo-alloc2/ xo-gc/ write-barrier

ability to inform allocator of gco->gco mutation, via AAllocator i/face.
---
 include/xo/stringtable2/DString.hpp                  | 5 -----
 include/xo/stringtable2/string/IGCObject_DString.hpp | 4 ++--
 utest/DString.test.cpp                               | 3 ++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/xo/stringtable2/DString.hpp b/include/xo/stringtable2/DString.hpp
index 73e165d..2d05bcf 100644
--- a/include/xo/stringtable2/DString.hpp
+++ b/include/xo/stringtable2/DString.hpp
@@ -6,7 +6,6 @@
 #pragma once
 
 #include <xo/alloc2/Allocator.hpp>
-//#include <xo/alloc2/Collector.hpp>
 #include <xo/alloc2/GCObjectVisitor.hpp>
 #include <xo/facet/obj.hpp>
 #include <xo/indentlog/print/ppindentinfo.hpp>
@@ -16,8 +15,6 @@
 //#include <cstdio>
 
 namespace xo {
-    namespace mm { class ACollector; }
-
     namespace scm {
         /** @class DString
          *  @brief String implementation with gc hooks
@@ -46,8 +43,6 @@ namespace xo {
             using const_iterator = const char *;
             /** xo allocator **/
             using AAllocator = xo::mm::AAllocator;
-            /** garbage collector **/
-            //using ACollector = xo::mm::ACollector;
             /** object visitor (garbage collector proxy) **/
             using AGCObjectVisitor = xo::mm::AGCObjectVisitor;
             /** visitor hint **/
diff --git a/include/xo/stringtable2/string/IGCObject_DString.hpp b/include/xo/stringtable2/string/IGCObject_DString.hpp
index e9c15f4..3f8ec15 100644
--- a/include/xo/stringtable2/string/IGCObject_DString.hpp
+++ b/include/xo/stringtable2/string/IGCObject_DString.hpp
@@ -43,7 +43,7 @@ namespace xo {
             ///@{
             using size_type = xo::mm::AGCObject::size_type;
             using AAllocator = xo::mm::AGCObject::AAllocator;
-            using ACollector = xo::mm::AGCObject::ACollector;
+            //using ACollector = xo::mm::AGCObject::ACollector;
             using AGCObjectVisitor = xo::mm::AGCObject::AGCObjectVisitor;
             using VisitReason = xo::mm::AGCObject::VisitReason;
             using Copaque = xo::mm::AGCObject::Copaque;
@@ -67,4 +67,4 @@ when @p fn invokes garbage collector reentry point **/
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/utest/DString.test.cpp b/utest/DString.test.cpp
index 9a7e116..1f095b0 100644
--- a/utest/DString.test.cpp
+++ b/utest/DString.test.cpp
@@ -6,7 +6,8 @@
 #include "init_stringtable2.hpp"
 #include "StringOps.hpp"
 #include <xo/alloc2/Allocator.hpp>
-#include <xo/alloc2/arena/IAllocator_DArena.hpp>
+#include <xo/alloc2/Arena.hpp>
+//#include <xo/alloc2/arena/IAllocator_DArena.hpp>
 #include <catch2/catch.hpp>
 #include <cctype>
 #include <cstring>