From 02534102de276bfd3360e9361e7dc11c603abd50 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Thu, 8 Jan 2026 18:37:18 -0500
Subject: [PATCH] xo-arena: DArenaHashMap: compiler nits after refactor

---
 xo-arena/include/xo/arena/DArenaHashMap.hpp        | 4 ++--
 xo-arena/include/xo/arena/hashmap/ControlGroup.hpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/xo-arena/include/xo/arena/DArenaHashMap.hpp b/xo-arena/include/xo/arena/DArenaHashMap.hpp
index e560bdbc..c20695e4 100644
--- a/xo-arena/include/xo/arena/DArenaHashMap.hpp
+++ b/xo-arena/include/xo/arena/DArenaHashMap.hpp
@@ -68,7 +68,7 @@ namespace xo {
             struct HashMapStore : DArenaHashMapUtil {
             public:
                 using value_type = std::pair<const Key, Value>;
-                using group_type = detail::Group;
+                using group_type = detail::ControlGroup;
 
             public:
                 /** group_exp2: number of groups {x, 2^x} **/
@@ -264,7 +264,7 @@ namespace xo {
             using key_hash = Hash;
             using key_equal = Equal;
             using byte = std::byte;
-            using group_type = detail::Group;
+            using group_type = detail::ControlGroup;
             using store_type = detail::HashMapStore<Key, Value>;
             using insert_value_type = std::pair<value_type *, bool>;
             using iterator = detail::DArenaHashMapIterator<Key, Value>;
diff --git a/xo-arena/include/xo/arena/hashmap/ControlGroup.hpp b/xo-arena/include/xo/arena/hashmap/ControlGroup.hpp
index 2b60a79f..d5db66af 100644
--- a/xo-arena/include/xo/arena/hashmap/ControlGroup.hpp
+++ b/xo-arena/include/xo/arena/hashmap/ControlGroup.hpp
@@ -17,10 +17,11 @@ namespace xo {
              *
              *  Support optimization using SIMD operations
              **/
-            struct Group {
+            struct ControlGroup {
                 std::array<uint8_t, DArenaHashMapUtil::c_group_size> ctrl_;
 
-                explicit Group(uint8_t * lo) {
+                /** Require: lo is aligned on c_group_size (probably 16 bytes) **/
+                explicit ControlGroup(uint8_t * lo) {
                     ::memcpy(ctrl_.data(), lo, DArenaHashMapUtil::c_group_size);
                 }