From c3cb10453b085eb9d7f9cd39f372af7d81bb680a Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Tue, 4 Aug 2020 01:11:00 +0200
Subject: [PATCH] Intermediate commit

---
 ext/ghoul                               | 2 +-
 include/openspace/util/factorymanager.h | 6 +-----
 src/util/factorymanager.cpp             | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index cb56bd8177..8264b80955 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit cb56bd8177d9e044d8640e9785cb83da86f3af9f
+Subproject commit 8264b80955fab966feffe6364125931f960428e6
diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index 3edc713b5f..7d04502609 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -28,13 +28,9 @@
 #include <openspace/documentation/documentationgenerator.h>
 
 #include <ghoul/misc/exception.h>
+#include <ghoul/misc/templatefactory.h>
 #include <memory>
 
-namespace ghoul {
-    template <class T> class TemplateFactory;
-    class TemplateFactoryBase;
-} // namespace ghoul
-
 namespace openspace {
 
 /**
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 3796976382..4a033832ef 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -70,7 +70,7 @@ FactoryManager& FactoryManager::ref() {
     return *_manager;
 }
 
-void FactoryManager::addFactory(std::unique_ptr<ghoul::TemplateFactoryBase> f,
+void FactoryManager::addFactory(std::unique_ptr<ghoul::TemplateFactoryBase<>> f,
                                 std::string name)
 {
     ghoul_assert(f, "Factory must not be nullptr");
@@ -87,7 +87,7 @@ std::string FactoryManager::generateJson() const {
         json << "\"name\": \"" << factoryInfo.name << "\",";
         json << "\"classes\": [";
 
-        ghoul::TemplateFactoryBase* f = factoryInfo.factory.get();
+        ghoul::TemplateFactoryBase<>* f = factoryInfo.factory.get();
         const std::vector<std::string>& registeredClasses = f->registeredClasses();
         for (const std::string& c : registeredClasses) {
             json << "\"" << c << "\"";