From fe67358efcbe8be916821db7fb12362d831e3a00 Mon Sep 17 00:00:00 2001 From: Elena Mamontova Date: Mon, 28 Nov 2016 15:12:12 +0200 Subject: [PATCH] Ticket 37. The time_t currentTime parameter added in TariffChangeIsAllow() function decfinition. The brackets added in construction if ((currentTime > timeout) && (timeout != 0)). --- projects/stargazer/tariff_impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp index c8a0161c..2daaeeb3 100644 --- a/projects/stargazer/tariff_impl.cpp +++ b/projects/stargazer/tariff_impl.cpp @@ -145,10 +145,10 @@ else 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(); -if (stgTime > timeout && timeout != 0) +if ((currentTime > timeout) && (timeout != 0)) return ""; switch (GetChangePolicy()) { -- 2.44.2