From 419cb097dd6129b3f10692fddec89124fcafdaeb Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Mon, 22 Dec 2025 22:24:10 -0500
Subject: [PATCH] xo-gc: refactor to extract DX1Collector etc from xo-alloc2/

---
 include/xo/object2/DList.hpp              | 2 +-
 include/xo/object2/IGCObject_DFloat.hpp   | 4 ++--
 include/xo/object2/IGCObject_DInteger.hpp | 4 ++--
 include/xo/object2/IGCObject_DList.hpp    | 9 +++------
 src/object2/CMakeLists.txt                | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/include/xo/object2/DList.hpp b/include/xo/object2/DList.hpp
index a9d0295..9710def 100644
--- a/include/xo/object2/DList.hpp
+++ b/include/xo/object2/DList.hpp
@@ -3,7 +3,7 @@
  *  @author Roland Conybeare, Dec 2025
  **/
 
-#include "xo/alloc2/GCObject.hpp"
+#include "xo/gc/GCObject.hpp"
 //#include "xo/alloc2/gcobject/RGCObject.hpp"
 #include "xo/facet/obj.hpp"
 
diff --git a/include/xo/object2/IGCObject_DFloat.hpp b/include/xo/object2/IGCObject_DFloat.hpp
index 6a96dcf..b00873c 100644
--- a/include/xo/object2/IGCObject_DFloat.hpp
+++ b/include/xo/object2/IGCObject_DFloat.hpp
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <xo/alloc2/alloc/AAllocator.hpp>
-#include <xo/alloc2/gcobject/AGCObject.hpp>
-#include <xo/alloc2/gcobject/IGCObject_Xfer.hpp>
+#include <xo/gc/gcobject/AGCObject.hpp>
+#include <xo/gc/gcobject/IGCObject_Xfer.hpp>
 #include "DFloat.hpp"
 
 namespace xo {
diff --git a/include/xo/object2/IGCObject_DInteger.hpp b/include/xo/object2/IGCObject_DInteger.hpp
index 765d2d9..858856b 100644
--- a/include/xo/object2/IGCObject_DInteger.hpp
+++ b/include/xo/object2/IGCObject_DInteger.hpp
@@ -6,8 +6,8 @@
 #pragma once
 
 #include "xo/alloc2/alloc/AAllocator.hpp"
-#include <xo/alloc2/gcobject/AGCObject.hpp>
-#include <xo/alloc2/gcobject/IGCObject_Xfer.hpp>
+#include <xo/gc/gcobject/AGCObject.hpp>
+#include <xo/gc/gcobject/IGCObject_Xfer.hpp>
 #include "DInteger.hpp"
 
 namespace xo {
diff --git a/include/xo/object2/IGCObject_DList.hpp b/include/xo/object2/IGCObject_DList.hpp
index dc3ffa6..b4f47c8 100644
--- a/include/xo/object2/IGCObject_DList.hpp
+++ b/include/xo/object2/IGCObject_DList.hpp
@@ -7,12 +7,9 @@
 
 #include <xo/alloc2/alloc/AAllocator.hpp>
 #include <xo/alloc2/alloc/RAllocator.hpp>
-#include <xo/alloc2/Collector.hpp>
-//#include <xo/alloc2/gc/ACollector.hpp>
-//#include <xo/alloc2/gc/ICollector_Any.hpp>
-//#include <xo/alloc2/gc/RCollector.hpp>
-#include <xo/alloc2/gcobject/AGCObject.hpp>
-#include <xo/alloc2/gcobject/IGCObject_Xfer.hpp>
+#include <xo/gc/Collector.hpp>
+#include <xo/gc/gcobject/AGCObject.hpp>
+#include <xo/gc/gcobject/IGCObject_Xfer.hpp>
 #include "DList.hpp"
 
 namespace xo {
diff --git a/src/object2/CMakeLists.txt b/src/object2/CMakeLists.txt
index f3c1382..644216a 100644
--- a/src/object2/CMakeLists.txt
+++ b/src/object2/CMakeLists.txt
@@ -9,5 +9,5 @@ set(SELF_SRCS
 
 xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})
 # note: deps here must also appear in cmake/xo_alloc2Config.cmake.in
-xo_dependency(${SELF_LIB} xo_alloc2)
+xo_dependency(${SELF_LIB} xo_gc)
 #xo_dependency(${SELF_LIB} indentlog)