xo-alloc2: header reorg redux

include/xo/alloc2/Allocator.hpp

@@ -5,8 +5,9 @@
 
 #pragma once
 
-#include "AAllocator.hpp"
-#include "IAllocator_Any.hpp"
-#include "RAllocator.hpp"
+#include "alloc/AAllocator.hpp"
+#include "alloc/IAllocator_Any.hpp"
+#include "alloc/IAllocator_Xfer.hpp"
+#include "alloc/RAllocator.hpp"
 
 /* end Allocator.hpp */

include/xo/alloc2/alloc/README

@@ -0,0 +1,4 @@
+AAllocator |<-- IAllocator_Any (D=DVariantPlaceholder)
+           |<-- IAllocator_Xfer<D,..>
+
+OObject<AAllocator,D> |<-- RAllocator<O>

include/xo/alloc2/arena/ArenaConfig.hpp

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "AllocatorError.hpp"
+#include "alloc/AllocatorError.hpp"
 #include <string>
 #include <cstdint>
 

include/xo/alloc2/arena/IAllocator_DArena.hpp

@@ -3,8 +3,8 @@
  *  @author Roland Conybeare, Dec 2025
  **/
 
-#include "AAllocator.hpp"
-#include "IAllocator_Xfer.hpp"
+#include "alloc/AAllocator.hpp"
+#include "alloc/IAllocator_Xfer.hpp"
 #include "arena/DArena.hpp"
 
 namespace xo {

src/alloc2/AAllocator.cpp

@@ -1,6 +1,6 @@
 /** @file AAllocator.cpp **/
 
-#include "xo/alloc2/AAllocator.hpp"
+#include "alloc/AAllocator.hpp"
 
 namespace xo {
     namespace mm {

src/alloc2/DArena.cpp

@@ -3,7 +3,7 @@
  *  @author Roland Conybeare, Dec 2025
  **/
 
-#include "xo/alloc2/AAllocator.hpp"
+#include "alloc/AAllocator.hpp"
 #include "arena/DArena.hpp"
 #include "xo/alloc2/padding.hpp"
 #include "xo/indentlog/print/tag.hpp"

src/alloc2/IAllocator_Any.cpp

@@ -3,7 +3,7 @@
  *  @author Roland Conybeare, Dec 2025
  **/
 
-#include "IAllocator_Any.hpp"
+#include "alloc/IAllocator_Any.hpp"
 #include <iostream>
 
 namespace xo {

src/alloc2/IAllocator_DArena.cpp

@@ -3,7 +3,7 @@
  *  @author Roland Conybeare, Dec 2025
  **/
 
-#include "IAllocator_DArena.hpp"
+#include "arena/IAllocator_DArena.hpp"
 #include "padding.hpp"
 #include "xo/indentlog/scope.hpp"
 #include <cassert>

utest/arena.test.cpp

@@ -5,10 +5,10 @@
 
 #include "xo/alloc2/Allocator.hpp"
 //#include "xo/alloc2/IAllocator_Any.hpp"
-#include "xo/alloc2/IAllocator_Xfer.hpp"
+#include "xo/alloc2/alloc/IAllocator_Xfer.hpp"
 //#include "xo/alloc2/DArena.hpp"
-#include "xo/alloc2/IAllocator_DArena.hpp"
-#include "xo/alloc2/RAllocator.hpp"
+#include "xo/alloc2/arena/IAllocator_DArena.hpp"
+//#include "xo/alloc2/alloc/RAllocator.hpp"
 #include "xo/alloc2/padding.hpp"
 #include "xo/indentlog/scope.hpp"
 #include "xo/facet/obj.hpp"