Fix for FactoryRegistration problem

ecmwf · Dec 12, 2024 · 4b3e396 · 4b3e396
1 parent a3b271a
commit 4b3e396
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/src/atlas/util/Factory.cc b/src/atlas/util/Factory.cc
@@ -112,5 +112,14 @@ FactoryBase::~FactoryBase() {
 
 //----------------------------------------------------------------------------------------------------------------------
 
+std::shared_ptr<FactoryRegistry> FactoryRegistry::instance(const std::string& factory) {
+    static std::map<std::string,std::shared_ptr<FactoryRegistry>> registries;
+    if (registries.find(factory) == registries.end()) {
+        auto [it_pair, inserted] = registries.emplace(factory, new FactoryRegistry(factory));
+        return it_pair->second;
+    }
+    return registries.at(factory);
+}
+
 }  // namespace util
 }  // namespace atlas
diff --git a/src/atlas/util/Factory.h b/src/atlas/util/Factory.h
@@ -26,7 +26,7 @@ namespace util {
 class FactoryBase;
 
 class FactoryRegistry {
-protected:
+private:
     FactoryRegistry(const std::string& factory);
     virtual ~FactoryRegistry();
 
@@ -43,19 +43,8 @@ class FactoryRegistry {
     void add(const std::string& builder, FactoryBase*);
     void remove(const std::string& builder);
     FactoryBase* get(const std::string& builder) const;
-};
-
-template <typename T>
-struct FactoryRegistryT : public FactoryRegistry {
-public:
-    static std::shared_ptr<FactoryRegistryT<T>> instance() {
-        static std::shared_ptr<FactoryRegistryT<T>> env(new FactoryRegistryT<T>(T::className()));
-        return env;
-    }
-    virtual ~FactoryRegistryT() {}
 
-protected:
-    FactoryRegistryT(const std::string& factory): FactoryRegistry(factory) {}
+    static std::shared_ptr<FactoryRegistry> instance(const std::string& factory);
 };
 
 class FactoryBase {
@@ -85,13 +74,13 @@ class Factory : public FactoryBase {
 
     Factory(const std::string& builder = ""): FactoryBase(registry(), builder) {
         if (not builder.empty()) {
-            attach_registry(FactoryRegistryT<T>::instance());
+            attach_registry(FactoryRegistry::instance(T::className()));
         }
     }
 
 protected:
     virtual ~Factory(){};
-    static FactoryRegistry& registry() { return *FactoryRegistryT<T>::instance().get(); }
+    static FactoryRegistry& registry() { return *FactoryRegistry::instance(T::className()).get(); }
 };
 
 //----------------------------------------------------------------------------------------------------------------------