Move variables declaration to the beginning of the function (old C)

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

diff --git a/include/stg/service_conf.h b/include/stg/service_conf.h
index 6c958c41289e5357b9756189023c731632d7201a..ef487f8ee78a41e624191930dd12660604dc0257 100644 (file)
--- a/include/stg/service_conf.h
+++ b/include/stg/service_conf.h
@@ -1,13 +1,40 @@
 #ifndef SERVICE_CONF_H
 #define SERVICE_CONF_H
 
+#include <string>
+
+#include "os_int.h"
+
 struct SERVICE_CONF
 {
-string  name;
-string  comment;
-double  cost;
-int     payDay;
+SERVICE_CONF()
+    : name(), comment(), cost(0), payDay(0)
+{}
+SERVICE_CONF(const std::string & n)
+    : name(n), comment(), cost(0), payDay(0)
+{}
+SERVICE_CONF(const std::string & n, double c)
+    : name(n), comment(), cost(c), payDay(0)
+{}
+SERVICE_CONF(const std::string & n, double c, unsigned p)
+    : name(n), comment(), cost(c), payDay(p)
+{}
+SERVICE_CONF(const std::string & n, double c,
+             unsigned p, const std::string & com)
+    : name(n), comment(com), cost(c), payDay(p)
+{}
+
+std::string name;
+std::string comment;
+double      cost;
+uint8_t     payDay;
 };
 
+inline
+bool operator==(const SERVICE_CONF & a, const SERVICE_CONF & b)
+{
+return a.name == b.name;
+}
+
 #endif //SERVICE_CONF_H