X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1b2fc630ee7edf4f8763bbf0e976789d26ff9372..85b2cf6a5286a94b5e35c7fc6b17bdf941f56420:/include/stg/service_conf.h?ds=sidebyside

diff --git a/include/stg/service_conf.h b/include/stg/service_conf.h
index 5f015d0b..ce2cff2e 100644
--- a/include/stg/service_conf.h
+++ b/include/stg/service_conf.h
@@ -3,6 +3,9 @@
 
 #include <string>
 
+#include "resetable.h"
+#include "os_int.h"
+
 struct SERVICE_CONF
 {
 SERVICE_CONF()
@@ -15,17 +18,49 @@ 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)
+    : name(n), comment(), cost(c), payDay(static_cast<uint8_t>(p))
 {}
 SERVICE_CONF(const std::string & n, double c,
              unsigned p, const std::string & com)
-    : name(n), comment(com), cost(c), payDay(p)
+    : name(n), comment(com), cost(c), payDay(static_cast<uint8_t>(p))
 {}
 
 std::string name;
 std::string comment;
 double      cost;
-unsigned    payDay;
+uint8_t     payDay;
+};
+
+struct SERVICE_CONF_RES
+{
+SERVICE_CONF_RES()
+    : name(), comment(),
+      cost(), payDay()
+{}
+
+SERVICE_CONF_RES & operator=(const SERVICE_CONF & conf)
+{
+name = conf.name;
+comment = conf.comment;
+cost = conf.cost;
+payDay = conf.payDay;
+return *this;
+}
+
+SERVICE_CONF GetData() const
+{
+SERVICE_CONF sc;
+sc.name = name.data();
+sc.comment = comment.data();
+sc.cost = cost.data();
+sc.payDay = payDay.data();
+return sc;
+}
+
+RESETABLE<std::string> name;
+RESETABLE<std::string> comment;
+RESETABLE<double>      cost;
+RESETABLE<uint8_t>     payDay;
 };
 
 inline