From e3aef4935e0c5137b5c3089881fec96fe4b5ebe7 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Wed, 4 Mar 2026 22:26:31 +1100
Subject: [PATCH] xo-gc xo-alloc2: move Collector faceet gc/ -> alloc2/ for
 levelling

---
 include/xo/procedure2/DPrimitive.hpp                          | 2 +-
 include/xo/procedure2/DPrimitive_gco_0.hpp                    | 2 +-
 include/xo/procedure2/DPrimitive_gco_1_gco.hpp                | 2 +-
 include/xo/procedure2/DPrimitive_gco_2_gco_gco.hpp            | 2 +-
 include/xo/procedure2/DPrimitive_gco_3_dict_string_gco.hpp    | 2 +-
 include/xo/procedure2/detail/AProcedure.hpp                   | 2 +-
 include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp   | 4 ++--
 .../xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp   | 4 ++--
 .../procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp  | 4 ++--
 .../detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp     | 4 ++--
 include/xo/procedure2/detail/IProcedure_Xfer.hpp              | 2 +-
 include/xo/procedure2/procedure2_register_facets.hpp          | 2 +-
 include/xo/procedure2/procedure2_register_types.hpp           | 2 +-
 src/procedure2/DPrimitive.cpp                                 | 2 +-
 src/procedure2/procedure2_register_facets.cpp                 | 2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/xo/procedure2/DPrimitive.hpp b/include/xo/procedure2/DPrimitive.hpp
index e458ce3..5003ba0 100644
--- a/include/xo/procedure2/DPrimitive.hpp
+++ b/include/xo/procedure2/DPrimitive.hpp
@@ -8,7 +8,7 @@
 #include "RuntimeContext.hpp"
 #include <xo/object2/DArray.hpp>
 #include <xo/gc/GCObjectConversion.hpp>
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/reflect/Reflect.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include <xo/facet/FacetRegistry.hpp>
diff --git a/include/xo/procedure2/DPrimitive_gco_0.hpp b/include/xo/procedure2/DPrimitive_gco_0.hpp
index 7e5633c..b6b02a9 100644
--- a/include/xo/procedure2/DPrimitive_gco_0.hpp
+++ b/include/xo/procedure2/DPrimitive_gco_0.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include "DPrimitive.hpp"
 
 namespace xo {
diff --git a/include/xo/procedure2/DPrimitive_gco_1_gco.hpp b/include/xo/procedure2/DPrimitive_gco_1_gco.hpp
index 56e540d..8e93967 100644
--- a/include/xo/procedure2/DPrimitive_gco_1_gco.hpp
+++ b/include/xo/procedure2/DPrimitive_gco_1_gco.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include "DPrimitive.hpp"
 
 namespace xo {
diff --git a/include/xo/procedure2/DPrimitive_gco_2_gco_gco.hpp b/include/xo/procedure2/DPrimitive_gco_2_gco_gco.hpp
index 78dd26b..a5895af 100644
--- a/include/xo/procedure2/DPrimitive_gco_2_gco_gco.hpp
+++ b/include/xo/procedure2/DPrimitive_gco_2_gco_gco.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include "DPrimitive.hpp"
 
 namespace xo {
diff --git a/include/xo/procedure2/DPrimitive_gco_3_dict_string_gco.hpp b/include/xo/procedure2/DPrimitive_gco_3_dict_string_gco.hpp
index c0dce65..29f18b2 100644
--- a/include/xo/procedure2/DPrimitive_gco_3_dict_string_gco.hpp
+++ b/include/xo/procedure2/DPrimitive_gco_3_dict_string_gco.hpp
@@ -7,7 +7,7 @@
 
 #include <xo/object2/Dictionary.hpp>
 #include <xo/object2/String.hpp>
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include "DPrimitive.hpp"
 
 namespace xo {
diff --git a/include/xo/procedure2/detail/AProcedure.hpp b/include/xo/procedure2/detail/AProcedure.hpp
index eb119fb..a5c41b4 100644
--- a/include/xo/procedure2/detail/AProcedure.hpp
+++ b/include/xo/procedure2/detail/AProcedure.hpp
@@ -15,7 +15,7 @@
 
 // includes (via {facet_includes})
 #include "RuntimeContext.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/facet/obj.hpp>
 #include <xo/facet/facet_implementation.hpp>
 #include <xo/facet/typeseq.hpp>
diff --git a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
index 91ff183..cfc5d19 100644
--- a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
+++ b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DPrimitive_gco_0.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
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 190a92c..d2dd1d3 100644
--- a/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp
+++ b/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DPrimitive_gco_1_gco.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
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 f6bfe6e..68fa0e5 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
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DPrimitive_gco_2_gco_gco.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
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 abb30bc..4f851cf 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
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "GCObject.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include "DPrimitive_gco_3_dict_string_gco.hpp"
 
@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
\ No newline at end of file
+/* end */
diff --git a/include/xo/procedure2/detail/IProcedure_Xfer.hpp b/include/xo/procedure2/detail/IProcedure_Xfer.hpp
index 0be093f..59742f3 100644
--- a/include/xo/procedure2/detail/IProcedure_Xfer.hpp
+++ b/include/xo/procedure2/detail/IProcedure_Xfer.hpp
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "RuntimeContext.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 
 namespace xo {
 namespace scm {
diff --git a/include/xo/procedure2/procedure2_register_facets.hpp b/include/xo/procedure2/procedure2_register_facets.hpp
index 219da3d..2a7128c 100644
--- a/include/xo/procedure2/procedure2_register_facets.hpp
+++ b/include/xo/procedure2/procedure2_register_facets.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <xo/gc/Collector.hpp>
+#include <xo/alloc2/Collector.hpp>
 
 namespace xo {
     namespace scm {
diff --git a/include/xo/procedure2/procedure2_register_types.hpp b/include/xo/procedure2/procedure2_register_types.hpp
index be0170a..98b0c5f 100644
--- a/include/xo/procedure2/procedure2_register_types.hpp
+++ b/include/xo/procedure2/procedure2_register_types.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <xo/gc/Collector.hpp>
+#include <xo/alloc2/Collector.hpp>
 
 namespace xo {
     namespace scm {
diff --git a/src/procedure2/DPrimitive.cpp b/src/procedure2/DPrimitive.cpp
index ab335d8..44903cc 100644
--- a/src/procedure2/DPrimitive.cpp
+++ b/src/procedure2/DPrimitive.cpp
@@ -4,7 +4,7 @@
  **/
 
 #include "DPrimitive.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 
 namespace xo {
     namespace scm {
diff --git a/src/procedure2/procedure2_register_facets.cpp b/src/procedure2/procedure2_register_facets.cpp
index b7b595e..0fb14fe 100644
--- a/src/procedure2/procedure2_register_facets.cpp
+++ b/src/procedure2/procedure2_register_facets.cpp
@@ -10,7 +10,7 @@
 #include "Primitive_gco_2_gco_gco.hpp"
 #include "Primitive_gco_3_dict_string_gco.hpp"
 
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/printable2/Printable.hpp>
 #include <xo/facet/FacetRegistry.hpp>
 #include <xo/indentlog/scope.hpp>