Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / include / stg / module_settings.h

diff --git a/include/stg/module_settings.h b/include/stg/module_settings.h
index a1baf33c80f1aba03e8d698c3e7422cfdccb2714..b94de10c25d2f56b71cabbaf5beef54e4a0f4fcb 100644 (file)
--- a/include/stg/module_settings.h
+++ b/include/stg/module_settings.h
@@ -14,9 +14,15 @@
 //-----------------------------------------------------------------------------
 struct PARAM_VALUE
 {
 //-----------------------------------------------------------------------------
 struct PARAM_VALUE
 {

-    PARAM_VALUE()
-        : param(),
-          value()
+    PARAM_VALUE() {}
+    PARAM_VALUE(const std::string& p, const std::vector<std::string>& vs)
+        : param(p),
+          value(vs)
+    {}
+    PARAM_VALUE(const std::string& p, const std::vector<std::string>& vs, const std::vector<PARAM_VALUE>& ss)
+        : param(p),
+          value(vs),
+          sections(ss)

     {}
     bool operator==(const PARAM_VALUE & rhs) const
         { return !strcasecmp(param.c_str(), rhs.param.c_str()); }
     {}
     bool operator==(const PARAM_VALUE & rhs) const
         { return !strcasecmp(param.c_str(), rhs.param.c_str()); }


@@ -26,17 +32,15 @@ struct PARAM_VALUE
 
     std::string param;
     std::vector<std::string> value;
 
     std::string param;
     std::vector<std::string> value;

+    std::vector<PARAM_VALUE> sections;

 };
 //-----------------------------------------------------------------------------
 struct MODULE_SETTINGS
 {
 };
 //-----------------------------------------------------------------------------
 struct MODULE_SETTINGS
 {

-    MODULE_SETTINGS()
-        : moduleName(),
-          moduleParams()
-    {}
-    MODULE_SETTINGS(const MODULE_SETTINGS & rvalue)
-        : moduleName(rvalue.moduleName),
-          moduleParams(rvalue.moduleParams)
+    MODULE_SETTINGS() {}
+    MODULE_SETTINGS(const std::string& name, const std::vector<PARAM_VALUE>& params)
+        : moduleName(name),
+          moduleParams(params)

     {}
     bool operator==(const MODULE_SETTINGS & rhs) const
         { return !strcasecmp(moduleName.c_str(), rhs.moduleName.c_str()); }
     {}
     bool operator==(const MODULE_SETTINGS & rhs) const
         { return !strcasecmp(moduleName.c_str(), rhs.moduleName.c_str()); }