Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / tariff_impl.cpp

diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp
index 2daaeeb3756c6bc8f8e7da3dc19bf22a78444efa..1fa2e82f624e2c06a155d068666ac09b537e6dea 100644 (file)
--- a/projects/stargazer/tariff_impl.cpp
+++ b/projects/stargazer/tariff_impl.cpp
@@ -28,12 +28,13 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-#include <ctime>
-#include <algorithm> // std::max
-
-#include "stg/common.h"

 #include "tariff_impl.h"
 #include "tariff_impl.h"

+

 #include "stg_timer.h"
 #include "stg_timer.h"

+#include "stg/common.h"
+
+#include <ctime>
+#include <algorithm> // std::max

 
 //-----------------------------------------------------------------------------
 TARIFF_IMPL & TARIFF_IMPL::operator=(const TARIFF_DATA & td)
 
 //-----------------------------------------------------------------------------
 TARIFF_IMPL & TARIFF_IMPL::operator=(const TARIFF_DATA & td)


@@ -42,12 +43,6 @@ tariffData = td;
 return *this;
 }
 //-----------------------------------------------------------------------------
 return *this;
 }
 //-----------------------------------------------------------------------------

-TARIFF_IMPL & TARIFF_IMPL::operator=(const TARIFF_IMPL & t)
-{
-tariffData = t.tariffData;
-return *this;
-}
-//-----------------------------------------------------------------------------

 double TARIFF_IMPL::GetPriceWithTraffType(uint64_t up,
                                      uint64_t down,
                                      int dir,
 double TARIFF_IMPL::GetPriceWithTraffType(uint64_t up,
                                      uint64_t down,
                                      int dir,


@@ -148,7 +143,7 @@ else
 std::string TARIFF_IMPL::TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const
 {
 time_t timeout = GetChangePolicyTimeout();
 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())
     {
     return "";
 switch (GetChangePolicy())
     {


@@ -167,5 +162,6 @@ switch (GetChangePolicy())
     case TARIFF::DENY:
         return "Current tariff '" + GetName() + "', new tariff '" + to.GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'.";
     }
     case TARIFF::DENY:
         return "Current tariff '" + GetName() + "', new tariff '" + to.GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'.";
     }

+return "";

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