]> git.stg.codes - stg.git/commitdiff
Ticket 37. The time_t currentTime parameter added in
authorElena Mamontova <helenh463@gmail.com>
Mon, 28 Nov 2016 13:12:12 +0000 (15:12 +0200)
committerElena Mamontova <helenh463@gmail.com>
Mon, 28 Nov 2016 13:12:12 +0000 (15:12 +0200)
TariffChangeIsAllow() function decfinition. The brackets added in
construction if ((currentTime > timeout) && (timeout != 0)).

projects/stargazer/tariff_impl.cpp

index c8a0161c6deddb67f67677e3945a2b25ed7cb306..2daaeeb3756c6bc8f8e7da3dc19bf22a78444efa 100644 (file)
@@ -145,10 +145,10 @@ else
     return tariffData.dirPrice[dir].priceDayA;
 }
 //-----------------------------------------------------------------------------
     return tariffData.dirPrice[dir].priceDayA;
 }
 //-----------------------------------------------------------------------------
-std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to) const
+std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const
 {
 time_t timeout = GetChangePolicyTimeout();
 {
 time_t timeout = GetChangePolicyTimeout();
-if (stgTime > timeout && timeout != 0)
+if ((currentTime > timeout) && (timeout != 0))
     return "";
 switch (GetChangePolicy())
     {
     return "";
 switch (GetChangePolicy())
     {