xo-expression2: streamline setup

include/xo/expression2/SetupExpression2.hpp

@@ -0,0 +1,25 @@
+/** @file SetupExpression2.hpp
+ *
+ *  @author Roland Conybeare, Jan 2026
+ **/
+
+#pragma once
+
+#include <xo/alloc2/Collector.hpp>
+
+namespace xo {
+    namespace scm {
+        class SetupExpression2 {
+        public:
+            using ACollector = xo::mm::ACollector;
+
+        public:
+            /** Register expression2 (facet,impl) combinations with FacetRegistry **/
+            static bool register_facets();
+            /** Register expression2 (facet,impl) combinations with FacetRegistry **/
+            static bool register_types(obj<ACollector> gc);
+        };
+    }
+}
+
+/* end SetupExpression2.hpp */

include/xo/expression2/expression2_register_facets.hpp

@@ -1,17 +0,0 @@
-/** @file expression2_register_facets.hpp
- *
- *  @author Roland Conybeare, Jan 2026
- **/
-
-#pragma once
-
-#include <xo/alloc2/Collector.hpp>
-
-namespace xo {
-    namespace scm {
-        /** Register expression2 (facet,impl) combinations with FacetRegistry **/
-        bool expression2_register_facets();
-    }
-}
-
-/* end expression2_register_facets.hpp */

include/xo/expression2/expression2_register_types.hpp

@@ -9,8 +9,6 @@
 
 namespace xo {
     namespace scm {
-        /** Register expression2 (facet,impl) combinations with FacetRegistry **/
-        bool expression2_register_types(obj<xo::mm::ACollector> gc);
     }
 }