From: Elena Mamontova <helenh463@gmail.com>
Date: Mon, 12 Dec 2016 13:18:05 +0000 (+0200)
Subject: Ticket 37. In the TariffChangeIsAllowed() function return "" added and
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/ee882f766d3173ed8ffb6e52b06749c10832f1bf?ds=sidebyside;hp=87300676aa712b358ab98beaa5082b7a19e5d97a

Ticket 37. In the TariffChangeIsAllowed() function return "" added and
unnecessary brackets removed in the if (currentTime > timeout && timeout != 0).
---

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 "";
 }
 //-----------------------------------------------------------------------------