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

---
 xo-alloc2/src/alloc2/DArena.cpp                             | 6 +++---
 xo-alloc2/utest/arena.test.cpp                              | 4 +---
 .../xo/alloc2 => xo-arena/include/xo/arena}/padding.hpp     | 0
 xo-object2/utest/X1Collector.test.cpp                       | 3 ++-
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename {xo-alloc2/include/xo/alloc2 => xo-arena/include/xo/arena}/padding.hpp (100%)

diff --git a/xo-alloc2/src/alloc2/DArena.cpp b/xo-alloc2/src/alloc2/DArena.cpp
index 82557e4b..c20d34b2 100644
--- a/xo-alloc2/src/alloc2/DArena.cpp
+++ b/xo-alloc2/src/alloc2/DArena.cpp
@@ -6,9 +6,9 @@
 #include "alloc/AAllocator.hpp"
 #include "arena/DArena.hpp"
 #include "arena/DArenaIterator.hpp"
-#include "xo/alloc2/padding.hpp"
-#include "xo/indentlog/scope.hpp"
-#include "xo/indentlog/print/tag.hpp"
+#include <xo/arena/padding.hpp>
+#include <xo/indentlog/scope.hpp>
+#include <xo/indentlog/print/tag.hpp>
 #include <cassert>
 #include <sys/mman.h> // for ::munmap()
 #include <unistd.h> // for ::getpagesize()
diff --git a/xo-alloc2/utest/arena.test.cpp b/xo-alloc2/utest/arena.test.cpp
index 6c3278ba..9bd87202 100644
--- a/xo-alloc2/utest/arena.test.cpp
+++ b/xo-alloc2/utest/arena.test.cpp
@@ -5,11 +5,9 @@
 
 #include "xo/alloc2/Allocator.hpp"
 #include "xo/alloc2/alloc/IAllocator_Xfer.hpp"
-//#include "xo/alloc2/DArena.hpp"
 #include "xo/alloc2/arena/IAllocator_DArena.hpp"
-//#include "xo/alloc2/alloc/RAllocator.hpp"
 #include "xo/alloc2/print.hpp"
-#include "xo/alloc2/padding.hpp"
+#include "xo/arena/padding.hpp"
 #include <xo/facet/obj.hpp>
 #include <xo/indentlog/scope.hpp>
 #include <catch2/catch.hpp>
diff --git a/xo-alloc2/include/xo/alloc2/padding.hpp b/xo-arena/include/xo/arena/padding.hpp
similarity index 100%
rename from xo-alloc2/include/xo/alloc2/padding.hpp
rename to xo-arena/include/xo/arena/padding.hpp
diff --git a/xo-object2/utest/X1Collector.test.cpp b/xo-object2/utest/X1Collector.test.cpp
index 1174635c..adfc9771 100644
--- a/xo-object2/utest/X1Collector.test.cpp
+++ b/xo-object2/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>