mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-12 14:40:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove more warnings on Jenkins

Browse Source
This commit is contained in:
Alexander Bock
2018-07-05 14:40:54 -04:00
parent e8735d4544
commit 8dce177d33
24 changed files with 98 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/engine/moduleengine.cpp
View File

@@ -90,30 +90,30 @@ void ModuleEngine::deinitializeGL() {
LDEBUG("Finished deinitializing OpenGL of modules");
}
void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> module,
void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> mod,
const ghoul::Dictionary& configuration)
{
ghoul_assert(module, "Module must not be nullptr");
ghoul_assert(mod, "Module must not be nullptr");
auto it = std::find_if(
_modules.begin(),
_modules.end(),
[&module](std::unique_ptr<OpenSpaceModule>& rhs) {
return rhs->identifier() == module->identifier();
[&mod](std::unique_ptr<OpenSpaceModule>& rhs) {
return rhs->identifier() == mod->identifier();
}
);
if (it != _modules.end()) {
throw ghoul::RuntimeError(
"Module name '" + module->identifier() + "' was registered before",
"Module name '" + mod->identifier() + "' was registered before",
"ModuleEngine"
);
}
LDEBUG(fmt::format("Registering module '{}'", module->identifier()));
module->initialize(this, configuration);
addPropertySubOwner(module.get());
LDEBUG(fmt::format("Registered module '{}'", module->identifier()));
_modules.push_back(std::move(module));
LDEBUG(fmt::format("Registering module '{}'", mod->identifier()));
mod->initialize(this, configuration);
addPropertySubOwner(mod.get());
LDEBUG(fmt::format("Registered module '{}'", mod->identifier()));
_modules.push_back(std::move(mod));
}
std::vector<OpenSpaceModule*> ModuleEngine::modules() const {