From: Maxim Mamontov Date: Sun, 11 Mar 2018 10:12:32 +0000 (+0200) Subject: Merge branch 'stg-2.409' into stg-2.409-radius X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/0d3126b51031578f051af3f38ed73b8e4e6a18bf Merge branch 'stg-2.409' into stg-2.409-radius --- 0d3126b51031578f051af3f38ed73b8e4e6a18bf diff --cc include/stg/module_settings.h index 5af5eefc,669cc225..b94de10c --- a/include/stg/module_settings.h +++ b/include/stg/module_settings.h @@@ -37,14 -26,6 +37,11 @@@ struct PARAM_VALU //----------------------------------------------------------------------------- struct MODULE_SETTINGS { - MODULE_SETTINGS() - : moduleName(), - moduleParams() - {} ++ MODULE_SETTINGS() {} + MODULE_SETTINGS(const std::string& name, const std::vector& params) + : moduleName(name), + moduleParams(params) + {} bool operator==(const MODULE_SETTINGS & rhs) const { return !strcasecmp(moduleName.c_str(), rhs.moduleName.c_str()); }