From: Elena Mamontova Date: Mon, 28 Nov 2016 13:12:12 +0000 (+0200) Subject: Ticket 37. The time_t currentTime parameter added in X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/34c6c923ebcbbca2527a7423f1d696b0bdb2d765?ds=inline;hp=--cc Ticket 37. The time_t currentTime parameter added in TariffChangeIsAllow() function decfinition. The brackets added in construction if ((currentTime > timeout) && (timeout != 0)). --- 34c6c923ebcbbca2527a7423f1d696b0bdb2d765 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()) {