From 8d500231f2a9ffa1437eb22233ad1a4a2cf4e458 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Tue, 6 Jan 2026 00:01:38 -0500
Subject: [PATCH 1/3] xo-arena xo-facet xo-alloc2: build restored

---
 include/xo/object2/DList.hpp     | 4 ++++
 src/object2/IPrintable_DList.cpp | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/xo/object2/DList.hpp b/include/xo/object2/DList.hpp
index f629693..6f803a8 100644
--- a/include/xo/object2/DList.hpp
+++ b/include/xo/object2/DList.hpp
@@ -8,6 +8,7 @@
 #include <xo/gc/GCObject.hpp>
 //#include "xo/alloc2/gcobject/RGCObject.hpp"
 #include <xo/facet/obj.hpp>
+#include <xo/indentlog/print/ppindentinfo.hpp>
 
 namespace xo {
     namespace scm {
@@ -16,6 +17,7 @@ namespace xo {
             using size_type = std::size_t;
             using AGCObject = xo::mm::AGCObject;
             using AAllocator = xo::mm::AAllocator;
+            using ppindentinfo = xo::print::ppindentinfo;
 
             DList(xo::obj<AGCObject> h,
                   DList * r) : head_{h}, rest_{r} {}
@@ -40,8 +42,10 @@ namespace xo {
             /** return element at 0-based index @p ix **/
             obj<AGCObject> at(size_type ix) const;
 
+#ifdef NOT_YET
             /** pretty-printing driver; combine layout+printing **/
             bool pretty(const ppindentinfo & ppii) const;
+#endif
 
             /** first member of list **/
             obj<AGCObject> head_;
diff --git a/src/object2/IPrintable_DList.cpp b/src/object2/IPrintable_DList.cpp
index 880af69..b705ad5 100644
--- a/src/object2/IPrintable_DList.cpp
+++ b/src/object2/IPrintable_DList.cpp
@@ -18,11 +18,17 @@ namespace xo {
         auto
         IPrintable_DList::pretty(const DList & self, const ppindentinfo & ppii) -> bool
         {
+            (void)self;
+            (void)ppii;
+
+            return false;
+#ifdef NOT_YET
             return self.pretty(ppii);
+#endif
         }
 
 
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end IPrintable_DList.cpp */
\ No newline at end of file
+/* end IPrintable_DList.cpp */

From fff821ec8f8188ea8d8333ee2463ceaf23679963 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Tue, 6 Jan 2026 00:08:50 -0500
Subject: [PATCH 2/3] xo-arena: annex padding from xo-alloc2

---
 utest/X1Collector.test.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utest/X1Collector.test.cpp b/utest/X1Collector.test.cpp
index 1174635..adfc977 100644
--- a/utest/X1Collector.test.cpp
+++ b/utest/X1Collector.test.cpp
@@ -17,7 +17,8 @@
 #include <xo/gc/detail/ICollector_DX1Collector.hpp>
 
 #include <xo/alloc2/AllocInfo.hpp>
-#include <xo/alloc2/padding.hpp>
+
+#include <xo/arena/padding.hpp>
 
 #include <xo/indentlog/scope.hpp>
 #include <xo/indentlog/print/tag.hpp>

From 80537c3d68cd2d7db7ab6d82d9c175fdd0fd9364 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Tue, 6 Jan 2026 00:14:13 -0500
Subject: [PATCH 3/3] xo-arena: annex AllocInfo.*pp from xo-alloc2

---
 utest/X1Collector.test.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/utest/X1Collector.test.cpp b/utest/X1Collector.test.cpp
index adfc977..8b37c8a 100644
--- a/utest/X1Collector.test.cpp
+++ b/utest/X1Collector.test.cpp
@@ -16,8 +16,7 @@
 #include <xo/gc/detail/IAllocator_DX1Collector.hpp>
 #include <xo/gc/detail/ICollector_DX1Collector.hpp>
 
-#include <xo/alloc2/AllocInfo.hpp>
-
+#include <xo/arena/AllocInfo.hpp>
 #include <xo/arena/padding.hpp>
 
 #include <xo/indentlog/scope.hpp>