From 58848bc9928836e54a0f9291fe1b08f8b5ffaded 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.
---
 .../xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp   | 1 -
 .../procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp  | 1 -
 .../detail/IGCObject_DPrimitive_gco_2_dict_string.hpp     | 1 -
 .../detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp         | 1 -
 .../detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp | 1 -
 include/xo/procedure2/detail/IProcedure_Xfer.hpp          | 8 ++++++++
 include/xo/procedure2/detail/IRuntimeContext_Xfer.hpp     | 8 ++++++++
 7 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
index 63986f8..93e4f5d 100644
--- a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
+++ b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
@@ -43,7 +43,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/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp
index c15dedb..40388df 100644
--- a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp
+++ b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp
@@ -43,7 +43,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/procedure2/detail/IGCObject_DPrimitive_gco_2_dict_string.hpp b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_dict_string.hpp
index 6cc1754..2970552 100644
--- a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_dict_string.hpp
+++ b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_dict_string.hpp
@@ -43,7 +43,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/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp
index 52c46f4..13ab7b3 100644
--- a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp
+++ b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp
@@ -43,7 +43,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/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp
index cc8294e..bcf0f9b 100644
--- a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp
+++ b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp
@@ -43,7 +43,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/procedure2/detail/IProcedure_Xfer.hpp b/include/xo/procedure2/detail/IProcedure_Xfer.hpp
index 59742f3..ebbbeb4 100644
--- a/include/xo/procedure2/detail/IProcedure_Xfer.hpp
+++ b/include/xo/procedure2/detail/IProcedure_Xfer.hpp
@@ -9,10 +9,18 @@
  *       [iface_facet_any.hpp.j2]
  *  3. idl for facet methods
  *       [idl/Procedure.json5]
+ *
+ *  variables:
+ *    {facet_hpp_fname} -> Procedure.hpp
+ *    {impl_hpp_subdir} -> detail
+ *    {facet_ns1} -> xo
+ *    {facet_detail_subdir} -> detail
+ *    {abstract_facet_fname} -> AProcedure.hpp
  **/
 
 #pragma once
 
+#include "AProcedure.hpp"
 #include "RuntimeContext.hpp"
 #include <xo/alloc2/GCObject.hpp>
 
diff --git a/include/xo/procedure2/detail/IRuntimeContext_Xfer.hpp b/include/xo/procedure2/detail/IRuntimeContext_Xfer.hpp
index 07b3074..ad33ea5 100644
--- a/include/xo/procedure2/detail/IRuntimeContext_Xfer.hpp
+++ b/include/xo/procedure2/detail/IRuntimeContext_Xfer.hpp
@@ -9,10 +9,18 @@
  *       [iface_facet_any.hpp.j2]
  *  3. idl for facet methods
  *       [idl/RuntimeContext.json5]
+ *
+ *  variables:
+ *    {facet_hpp_fname} -> RuntimeContext.hpp
+ *    {impl_hpp_subdir} -> detail
+ *    {facet_ns1} -> xo
+ *    {facet_detail_subdir} -> detail
+ *    {abstract_facet_fname} -> ARuntimeContext.hpp
  **/
 
 #pragma once
 
+#include "ARuntimeContext.hpp"
 #include <xo/stringtable2/StringTable.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include <xo/alloc2/Collector.hpp>