Minor changes.

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

diff --git a/include/stg/tariff_conf.h b/include/stg/tariff_conf.h
index a33247d66b897096cbb0d255a7d45cc135a47429..f705d0a0bef90e4e8575791505a76df8cb81934a 100644 (file)
--- a/include/stg/tariff_conf.h
+++ b/include/stg/tariff_conf.h
@@ -162,7 +162,7 @@ struct TARIFF_CONF
           changePolicyTimeout(0)
         {}
 
           changePolicyTimeout(0)
         {}
 

-    TARIFF_CONF(const std::string & n)
+    explicit TARIFF_CONF(const std::string & n)

         : fee(0),
           free(0),
           traffType(TARIFF::TRAFF_UP_DOWN),
         : fee(0),
           free(0),
           traffType(TARIFF::TRAFF_UP_DOWN),


@@ -183,7 +183,8 @@ struct TARIFF_CONF_RES
           passiveCost(),
           name(),
           period(),
           passiveCost(),
           name(),
           period(),

-          changePolicy()
+          changePolicy(),
+          changePolicyTimeout()

         {}
 
     TARIFF_CONF_RES & operator=(const TARIFF_CONF & tc)
         {}
 
     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;
         name        = tc.name;
         period      = tc.period;
         changePolicy = tc.changePolicy;

+        changePolicyTimeout = tc.changePolicyTimeout;

         return *this;
         }
 
         return *this;
         }
 


@@ -208,6 +210,7 @@ struct TARIFF_CONF_RES
         traffType.maybeSet(tc.traffType);
         period.maybeSet(tc.period);
         changePolicy.maybeSet(tc.changePolicy);
         traffType.maybeSet(tc.traffType);
         period.maybeSet(tc.period);
         changePolicy.maybeSet(tc.changePolicy);

+        changePolicyTimeout.maybeSet(tc.changePolicyTimeout);

         return tc;
         }
 
         return tc;
         }
 


@@ -218,6 +221,7 @@ struct TARIFF_CONF_RES
     RESETABLE<std::string>        name;
     RESETABLE<TARIFF::PERIOD>     period;
     RESETABLE<TARIFF::CHANGE_POLICY> changePolicy;
     RESETABLE<std::string>        name;
     RESETABLE<TARIFF::PERIOD>     period;
     RESETABLE<TARIFF::CHANGE_POLICY> changePolicy;

+    RESETABLE<time_t>             changePolicyTimeout;

 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA
 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA


@@ -230,22 +234,10 @@ struct TARIFF_DATA
           dirPrice(DIR_NUM)
         {}
 
           dirPrice(DIR_NUM)
         {}
 

-    TARIFF_DATA(const std::string & name)
+    explicit TARIFF_DATA(const std::string & name)

         : tariffConf(name),
           dirPrice(DIR_NUM)
         {}
         : tariffConf(name),
           dirPrice(DIR_NUM)
         {}

-
-    TARIFF_DATA(const TARIFF_DATA & td)
-        : tariffConf(td.tariffConf),
-          dirPrice(td.dirPrice)
-        {}
-
-    TARIFF_DATA & operator=(const TARIFF_DATA & td)
-        {
-        tariffConf = td.tariffConf;
-        dirPrice = td.dirPrice;
-        return *this;
-        }

 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA_RES
 };
 //-----------------------------------------------------------------------------
 struct TARIFF_DATA_RES