update Factory to allow for chained inheritance (#498)

AMReX-Combustion · May 15, 2024 · 37cb002 · 37cb002
1 parent 1bea1bf
commit 37cb002
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Source/Factory.H b/Source/Factory.H
@@ -92,12 +92,14 @@ struct Factory
   }
 
   //! Class to handle registration of subclass for runtime selection
-  template <class T>
-  struct Register : public Base
+  template <class T, class DeriveFrom = Base>
+  struct Register : public DeriveFrom
   {
     friend T;
     static bool registered;
 
+    static_assert(std::is_base_of_v<Base, DeriveFrom> == true);
+
     static bool add_sub_type()
     {
       // TODO: Add checks against multiple registration
@@ -155,9 +157,9 @@ private:
 };
 
 template <class Base, class... Args>
-template <class T>
-bool Factory<Base, Args...>::Register<T>::registered =
-  Factory<Base, Args...>::Register<T>::add_sub_type();
+template <class T, class DeriveFrom>
+bool Factory<Base, Args...>::Register<T, DeriveFrom>::registered =
+  Factory<Base, Args...>::Register<T, DeriveFrom>::add_sub_type();
 
 } // namespace pele::physics
 #endif /* FACTORY_H */