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 d619b32d78e4bc178cef6787b8d3bb279df06b20..ad0eaedf66f37654d96b14a332a740289bd49291 100644 (file)
--- 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:
 switch (GetChangePolicy())
     {
     case TARIFF::ALLOW:

-        {

         return "";
         return "";

-        }

     case TARIFF::TO_CHEAP:
     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() + ".";
         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:
     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() + ".";
         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:
     case TARIFF::DENY:

-        {

         return "Current tariff " + GetName() + ", new tariff " + to.GetName() + ".";
         return "Current tariff " + GetName() + ", new tariff " + to.GetName() + ".";

-        }

     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------