From ee882f766d3173ed8ffb6e52b06749c10832f1bf Mon Sep 17 00:00:00 2001 From: Elena Mamontova Date: Mon, 12 Dec 2016 15:18:05 +0200 Subject: [PATCH 1/1] Ticket 37. In the TariffChangeIsAllowed() function return "" added and unnecessary brackets removed in the if (currentTime > timeout && timeout != 0). --- projects/stargazer/tariff_impl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp index 2daaeeb3..7dbae0da 100644 --- a/projects/stargazer/tariff_impl.cpp +++ b/projects/stargazer/tariff_impl.cpp @@ -148,7 +148,7 @@ else std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const { time_t timeout = GetChangePolicyTimeout(); -if ((currentTime > timeout) && (timeout != 0)) +if (currentTime > timeout && timeout != 0) return ""; switch (GetChangePolicy()) { @@ -167,5 +167,6 @@ switch (GetChangePolicy()) case TARIFF::DENY: return "Current tariff '" + GetName() + "', new tariff '" + to.GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'."; } +return ""; } //----------------------------------------------------------------------------- -- 2.44.2