From fd02d9f834df54a2ac4ff8bd5b7f8decd09bd0b8 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Tue, 13 Jan 2026 16:43:14 -0500
Subject: [PATCH] xo-alloc2: prefer with_facet in arena utest

---
 xo-alloc2/utest/arena.test.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/xo-alloc2/utest/arena.test.cpp b/xo-alloc2/utest/arena.test.cpp
index ed168330..42ffa904 100644
--- a/xo-alloc2/utest/arena.test.cpp
+++ b/xo-alloc2/utest/arena.test.cpp
@@ -23,6 +23,7 @@ namespace xo {
     using xo::mm::AllocHeader;
     using xo::mm::padding;
     using xo::mm::error;
+    using xo::facet::with_facet;
     using xo::facet::obj;
     using xo::facet::typeseq;
     using xo::scope;
@@ -93,7 +94,8 @@ namespace xo {
             ArenaConfig cfg { .name_ = "testarena",
                               .size_ = 1 };
             DArena arena = DArena::map(cfg);
-            obj<AAllocator, DArena> a1o{&arena};
+            //obj<AAllocator, DArena> a1o{&arena};
+            auto a1o = with_facet<AAllocator>::mkobj(&arena);
 
             REQUIRE(a1o);
             REQUIRE(a1o.iface() != nullptr);
@@ -117,7 +119,8 @@ namespace xo {
                               .size_ = 1,
                               .debug_flag_ = false };
             DArena arena = DArena::map(cfg);
-            obj<AAllocator, DArena> a1o{&arena};
+            //obj<AAllocator, DArena> a1o{&arena};
+            auto a1o = with_facet<AAllocator>::mkobj(&arena);
 
             REQUIRE(a1o.available() == 0);
             REQUIRE(a1o.allocated() == 0);
@@ -147,7 +150,8 @@ namespace xo {
                               .size_ = 64*1024,
                               .debug_flag_ = false };
             DArena arena = DArena::map(cfg);
-            obj<AAllocator, DArena> a1o{&arena};
+            //obj<AAllocator, DArena> a1o{&arena};
+            auto a1o = with_facet<AAllocator>::mkobj(&arena);
 
             REQUIRE(a1o.reserved() >= cfg.size_);
             REQUIRE(a1o.committed() == 0);
@@ -196,7 +200,8 @@ namespace xo {
                               .debug_flag_ = false,
             };
             DArena arena = DArena::map(cfg);
-            obj<AAllocator, DArena> a1o{&arena};
+            //obj<AAllocator, DArena> a1o{&arena};
+            auto a1o = with_facet<AAllocator>::mkobj(&arena);
 
             REQUIRE(a1o.reserved() >= cfg.size_);
             REQUIRE(a1o.committed() == 0);
@@ -239,7 +244,8 @@ namespace xo {
                               .debug_flag_ = false,
             };
             DArena arena = DArena::map(cfg);
-            obj<AAllocator, DArena> a1o{&arena};
+            //obj<AAllocator, DArena> a1o{&arena};
+            auto a1o = with_facet<AAllocator>::mkobj(&arena);
 
             REQUIRE(a1o.reserved() >= cfg.size_);
             REQUIRE(a1o.committed() == 0);
@@ -289,7 +295,8 @@ namespace xo {
                               .size_ = 64*1024,
                               .debug_flag_ = false };
             DArena arena = DArena::map(cfg);
-            obj<AAllocator, DArena> a1o{&arena};
+            auto a1o = with_facet<AAllocator>::mkobj(&arena);
+            //obj<AAllocator, DArena> a1o{&arena};
 
             REQUIRE(cfg.size_ <= cfg.hugepage_z_);