Ticket 37. The time_t currentTime parameter added in

TariffChangeIsAllow() function decfinition. The brackets added in
construction if ((currentTime > timeout) && (timeout != 0)).

diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp
index c8a0161c6deddb67f67677e3945a2b25ed7cb306..2daaeeb3756c6bc8f8e7da3dc19bf22a78444efa 100644 (file)
--- a/projects/stargazer/tariff_impl.cpp
+++ b/projects/stargazer/tariff_impl.cpp
@@ -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())
     {