From daf34afb27c4bc08aca3dccfe3102ed729c1b5b1 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Sat, 2 May 2026 13:49:29 -0400
Subject: [PATCH] xo-gc stack: refactor + streamline.

Retiring unused Collector typealiases.
Fix #include topology.
Fix/improve write barrier setup.
---
 include/xo/type/array/IGCObject_DArrayType.hpp       | 1 -
 include/xo/type/atomic/IGCObject_DAtomicType.hpp     | 1 -
 include/xo/type/function/IGCObject_DFunctionType.hpp | 1 -
 include/xo/type/list/IGCObject_DListType.hpp         | 1 -
 include/xo/type/type/IType_Xfer.hpp                  | 8 ++++++++
 include/xo/type/typevar/IGCObject_DTypeVarRef.hpp    | 1 -
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/xo/type/array/IGCObject_DArrayType.hpp b/include/xo/type/array/IGCObject_DArrayType.hpp
index 9cbede8..067608e 100644
--- a/include/xo/type/array/IGCObject_DArrayType.hpp
+++ b/include/xo/type/array/IGCObject_DArrayType.hpp
@@ -41,7 +41,6 @@ namespace xo {
             ///@{
             using size_type = xo::mm::AGCObject::size_type;
             using AAllocator = xo::mm::AGCObject::AAllocator;
-            using ACollector = xo::mm::AGCObject::ACollector;
             using AGCObjectVisitor = xo::mm::AGCObject::AGCObjectVisitor;
             using VisitReason = xo::mm::AGCObject::VisitReason;
             using Copaque = xo::mm::AGCObject::Copaque;
diff --git a/include/xo/type/atomic/IGCObject_DAtomicType.hpp b/include/xo/type/atomic/IGCObject_DAtomicType.hpp
index d29bd6a..a4c7f1d 100644
--- a/include/xo/type/atomic/IGCObject_DAtomicType.hpp
+++ b/include/xo/type/atomic/IGCObject_DAtomicType.hpp
@@ -41,7 +41,6 @@ namespace xo {
             ///@{
             using size_type = xo::mm::AGCObject::size_type;
             using AAllocator = xo::mm::AGCObject::AAllocator;
-            using ACollector = xo::mm::AGCObject::ACollector;
             using AGCObjectVisitor = xo::mm::AGCObject::AGCObjectVisitor;
             using VisitReason = xo::mm::AGCObject::VisitReason;
             using Copaque = xo::mm::AGCObject::Copaque;
diff --git a/include/xo/type/function/IGCObject_DFunctionType.hpp b/include/xo/type/function/IGCObject_DFunctionType.hpp
index 0d54487..38d9f00 100644
--- a/include/xo/type/function/IGCObject_DFunctionType.hpp
+++ b/include/xo/type/function/IGCObject_DFunctionType.hpp
@@ -41,7 +41,6 @@ namespace xo {
             ///@{
             using size_type = xo::mm::AGCObject::size_type;
             using AAllocator = xo::mm::AGCObject::AAllocator;
-            using ACollector = xo::mm::AGCObject::ACollector;
             using AGCObjectVisitor = xo::mm::AGCObject::AGCObjectVisitor;
             using VisitReason = xo::mm::AGCObject::VisitReason;
             using Copaque = xo::mm::AGCObject::Copaque;
diff --git a/include/xo/type/list/IGCObject_DListType.hpp b/include/xo/type/list/IGCObject_DListType.hpp
index edb1781..5d5c5fb 100644
--- a/include/xo/type/list/IGCObject_DListType.hpp
+++ b/include/xo/type/list/IGCObject_DListType.hpp
@@ -41,7 +41,6 @@ namespace xo {
             ///@{
             using size_type = xo::mm::AGCObject::size_type;
             using AAllocator = xo::mm::AGCObject::AAllocator;
-            using ACollector = xo::mm::AGCObject::ACollector;
             using AGCObjectVisitor = xo::mm::AGCObject::AGCObjectVisitor;
             using VisitReason = xo::mm::AGCObject::VisitReason;
             using Copaque = xo::mm::AGCObject::Copaque;
diff --git a/include/xo/type/type/IType_Xfer.hpp b/include/xo/type/type/IType_Xfer.hpp
index dbc82bc..7e5ab5e 100644
--- a/include/xo/type/type/IType_Xfer.hpp
+++ b/include/xo/type/type/IType_Xfer.hpp
@@ -9,10 +9,18 @@
  *       [iface_facet_any.hpp.j2]
  *  3. idl for facet methods
  *       [idl/Type.json5]
+ *
+ *  variables:
+ *    {facet_hpp_fname} -> Type.hpp
+ *    {impl_hpp_subdir} -> type
+ *    {facet_ns1} -> xo
+ *    {facet_detail_subdir} -> type
+ *    {abstract_facet_fname} -> AType.hpp
  **/
 
 #pragma once
 
+#include "AType.hpp"
 #include <xo/type/Metatype.hpp>
 #include <xo/reflect/TypeDescr.hpp>
 
diff --git a/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp b/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp
index 1ba0a87..8b6b382 100644
--- a/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp
+++ b/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp
@@ -41,7 +41,6 @@ namespace xo {
             ///@{
             using size_type = xo::mm::AGCObject::size_type;
             using AAllocator = xo::mm::AGCObject::AAllocator;
-            using ACollector = xo::mm::AGCObject::ACollector;
             using AGCObjectVisitor = xo::mm::AGCObject::AGCObjectVisitor;
             using VisitReason = xo::mm::AGCObject::VisitReason;
             using Copaque = xo::mm::AGCObject::Copaque;