Revert "Merge remote-tracking branch 'origin/master' into ticket37"

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

diff --git a/include/stg/service_conf.h b/include/stg/service_conf.h
index ce2cff2ec484344a032b216118abf62cf33ba671..84f052a557b55f0befe40b09b24cb50547135b82 100644 (file)
--- a/include/stg/service_conf.h
+++ b/include/stg/service_conf.h
@@ -1,11 +1,31 @@
+/*
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
+ */
+
 #ifndef SERVICE_CONF_H
 #define SERVICE_CONF_H
 
-#include <string>
-
 #include "resetable.h"
 #include "os_int.h"
 
+#include <string>
+
 struct SERVICE_CONF
 {
 SERVICE_CONF()
@@ -38,6 +58,11 @@ SERVICE_CONF_RES()
       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;
@@ -57,6 +82,14 @@ sc.payDay = payDay.data();
 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;