sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Modules: Fix env var override when no parameter is passed

This commit is contained in:
Lynix 2023-12-02 13:43:31 +01:00
parent 4ee4092bba
commit 76404f5e0e
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/Nazara/Core/Modules.hpp
View File

@ -8,17 +8,15 @@
#define NAZARA_CORE_MODULES_HPP #define NAZARA_CORE_MODULES_HPP
#include <NazaraUtils/TypeList.hpp> #include <NazaraUtils/TypeList.hpp>
#include <Nazara/Core/CommandLineParameters.hpp>
namespace Nz namespace Nz
{ {
class CommandLineParameters;
namespace Detail namespace Detail
{ {
template<typename Module, typename... Modules> template<typename Module, typename... Modules>
struct ModuleTuple : ModuleTuple<Module>, ModuleTuple<Modules...> struct ModuleTuple : ModuleTuple<Module>, ModuleTuple<Modules...>
{ {
template<typename... ModuleConfig> ModuleTuple(ModuleConfig&&... configs);
template<typename... ModuleConfig> ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs); template<typename... ModuleConfig> ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs);
template<typename T> T& Get(); template<typename T> T& Get();
@ -27,7 +25,6 @@ namespace Nz
template<typename Module> template<typename Module>
struct ModuleTuple<Module> struct ModuleTuple<Module>
{ {
template<typename... ModuleConfig> ModuleTuple(ModuleConfig&&... configs);
template<typename... ModuleConfig> ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs); template<typename... ModuleConfig> ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs);
template<typename T> T& Get(); template<typename T> T& Get();

23
include/Nazara/Core/Modules.inl
View File

@ -51,24 +51,11 @@ namespace Nz
} }
} }
static T Get()
{
return T{};
}
static auto Get(const CommandLineParameters& parameters) static auto Get(const CommandLineParameters& parameters)
{ {
return OverrideModuleConfig(T{}, parameters); return OverrideModuleConfig(T{}, parameters);
} }
}; };
template<typename Module, typename... Modules>
template<typename... ModuleConfig>
ModuleTuple<Module, Modules...>::ModuleTuple(ModuleConfig&&... configs) :
ModuleTuple<Module>(std::forward<ModuleConfig>(configs)...),
ModuleTuple<Modules...>(std::forward<ModuleConfig>(configs)...)
{
}
template<typename Module, typename... Modules> template<typename Module, typename... Modules>
template<typename... ModuleConfig> template<typename... ModuleConfig>
@ -88,14 +75,6 @@ namespace Nz
return ModuleTuple<Modules...>::template Get<T>(); return ModuleTuple<Modules...>::template Get<T>();
} }
template<typename Module>
template<typename... ModuleConfig>
ModuleTuple<Module>::ModuleTuple(ModuleConfig&&... configs) :
m(Pick<typename Module::Config>::Get(std::forward<ModuleConfig>(configs)...))
{
}
template<typename Module> template<typename Module>
template<typename... ModuleConfig> template<typename... ModuleConfig>
ModuleTuple<Module>::ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs) : ModuleTuple<Module>::ModuleTuple(const CommandLineParameters& parameters, ModuleConfig&&... configs) :
@ -115,7 +94,7 @@ namespace Nz
template<typename... ModuleList> template<typename... ModuleList>
template<typename... ModuleConfig> template<typename... ModuleConfig>
Modules<ModuleList...>::Modules(ModuleConfig&&... configs) : Modules<ModuleList...>::Modules(ModuleConfig&&... configs) :
m_modules(std::forward<ModuleConfig>(configs)...) m_modules(CommandLineParameters{}, std::forward<ModuleConfig>(configs)...)
{ {
} }