GCC version, warnings.

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

diff --git a/include/stg/service_conf.h b/include/stg/service_conf.h
index 473830e44393636b301efdb16cc97a1a926acf99..a9b8d5c4e3aaa43ccf2940fe605fc32b4f717d31 100644 (file)
--- a/include/stg/service_conf.h
+++ b/include/stg/service_conf.h
@@ -22,16 +22,16 @@
 #define SERVICE_CONF_H
 
 #include "resetable.h"
 #define SERVICE_CONF_H
 
 #include "resetable.h"

-#include "os_int.h"

 
 #include <string>
 
 #include <string>

+#include <cstdint>

 
 struct SERVICE_CONF
 {
 SERVICE_CONF()
     : name(), comment(), cost(0), payDay(0)
 {}
 
 struct SERVICE_CONF
 {
 SERVICE_CONF()
     : name(), comment(), cost(0), payDay(0)
 {}

-SERVICE_CONF(const std::string & n)
+explicit 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(0), payDay(0)
 {}
 SERVICE_CONF(const std::string & n, double c)


@@ -58,6 +58,11 @@ SERVICE_CONF_RES()
       cost(), payDay()
 {}
 
       cost(), payDay()
 {}
 

+explicit SERVICE_CONF_RES(const SERVICE_CONF & rhs)
+    : name(rhs.name), comment(rhs.comment),
+      cost(rhs.cost), payDay(rhs.payDay)
+{}
+

 SERVICE_CONF_RES & operator=(const SERVICE_CONF & conf)
 {
 name = conf.name;
 SERVICE_CONF_RES & operator=(const SERVICE_CONF & conf)
 {
 name = conf.name;


@@ -77,6 +82,14 @@ sc.payDay = payDay.data();
 return sc;
 }
 
 return sc;
 }
 

+void Splice(const SERVICE_CONF_RES & rhs)
+{
+name.splice(rhs.name);
+comment.splice(rhs.comment);
+cost.splice(rhs.cost);
+payDay.splice(rhs.payDay);
+}
+

 RESETABLE<std::string> name;
 RESETABLE<std::string> comment;
 RESETABLE<double>      cost;
 RESETABLE<std::string> name;
 RESETABLE<std::string> comment;
 RESETABLE<double>      cost;