git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket 37. test<11>, test<12>, test<13> added. Current time argument
[stg.git]
/
include
/
stg
/
service_conf.h
diff --git
a/include/stg/service_conf.h
b/include/stg/service_conf.h
index 473830e44393636b301efdb16cc97a1a926acf99..84f052a557b55f0befe40b09b24cb50547135b82 100644
(file)
--- a/
include/stg/service_conf.h
+++ b/
include/stg/service_conf.h
@@
-58,6
+58,11
@@
SERVICE_CONF_RES()
cost(), payDay()
{}
cost(), payDay()
{}
+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;