From: Elena Mamontova Date: Mon, 8 Aug 2016 12:18:48 +0000 (+0300) Subject: Ticket 37. The braces removed in the case construction in the X-Git-Tag: 2.409~122 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/9aaa3a290aa5421a44c8a49d9660114888aecc4e?ds=sidebyside Ticket 37. The braces removed in the case construction in the TariffChangeIsAllowed() function. --- diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp index d619b32d..ad0eaedf 100644 --- a/projects/stargazer/tariff_impl.cpp +++ b/projects/stargazer/tariff_impl.cpp @@ -150,27 +150,19 @@ std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to) const switch (GetChangePolicy()) { case TARIFF::ALLOW: - { return ""; - } case TARIFF::TO_CHEAP: - { if (to.GetFee() < GetFee()) return ""; else return "Current tariff " + GetName() + " is more cheap than new tariff " + to.GetName() + ". The policy is " + TARIFF::ChangePolicyToString(GetChangePolicy()).c_str() + "."; - } case TARIFF::TO_EXPENSIVE: - { if (to.GetFee() > GetFee()) return ""; else return "Current tariff " + GetName() + " is more expensive than new tariff " + to.GetName() + ". The policy is " + TARIFF::ChangePolicyToString(GetChangePolicy()).c_str() + "."; - } case TARIFF::DENY: - { return "Current tariff " + GetName() + ", new tariff " + to.GetName() + "."; - } } } //-----------------------------------------------------------------------------