From: Elena Mamontova <helenh463@gmail.com>
Date: Thu, 15 Sep 2016 13:38:57 +0000 (+0300)
Subject: Ticket 37. RESETABLE<time_t>changePolicyTimeout field declared in the struct
X-Git-Tag: 2.409~90
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/35c60a5b8d010b881af44c14c8438473dab55335?hp=cd109e618baab42a4490851aef6f779612512eea

Ticket 37. RESETABLE<time_t>changePolicyTimeout field declared in the struct
TARIFF_CONF_RES and added in constructor, operator and GetData()
function.
---

diff --git a/include/stg/tariff_conf.h b/include/stg/tariff_conf.h
index a33247d6..79ade2eb 100644
--- a/include/stg/tariff_conf.h
+++ b/include/stg/tariff_conf.h
@@ -183,7 +183,8 @@ struct TARIFF_CONF_RES
           passiveCost(),
           name(),
           period(),
-          changePolicy()
+          changePolicy(),
+          changePolicyTimeout()
         {}
 
     TARIFF_CONF_RES & operator=(const TARIFF_CONF & tc)
@@ -195,6 +196,7 @@ struct TARIFF_CONF_RES
         name        = tc.name;
         period      = tc.period;
         changePolicy = tc.changePolicy;
+        changePolicyTimeout = tc.changePolicyTimeout;
         return *this;
         }
 
@@ -208,6 +210,7 @@ struct TARIFF_CONF_RES
         traffType.maybeSet(tc.traffType);
         period.maybeSet(tc.period);
         changePolicy.maybeSet(tc.changePolicy);
+        changePolicyTimeout.maybeSet(tc.changePolicyTimeout);
         return tc;
         }
 
@@ -218,6 +221,7 @@ struct TARIFF_CONF_RES
     RESETABLE<std::string>        name;
     RESETABLE<TARIFF::PERIOD>     period;
     RESETABLE<TARIFF::CHANGE_POLICY> changePolicy;
+    RESETABLE<time_t>             changePolicyTimeout;
 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA