mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-23 05:19:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Intermediate commit

Browse Source
This commit is contained in:
Alexander Bock
2020-08-04 01:11:00 +02:00
parent 1a98b57c3b
commit c3cb10453b
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: cb56bd8177...8264b80955

6
include/openspace/util/factorymanager.h
View File

@@ -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 {
/**

4
src/util/factorymanager.cpp
View File

@@ -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 << "\"";