X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/fe67358efcbe8be916821db7fb12362d831e3a00..b4dba83ccd632236b4f6ac78caa6637bc0874e35:/projects/stargazer/tariff_impl.cpp diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp index 2daaeeb3..1fa2e82f 100644 --- a/projects/stargazer/tariff_impl.cpp +++ b/projects/stargazer/tariff_impl.cpp @@ -28,12 +28,13 @@ $Author: faust $ */ -#include -#include // std::max - -#include "stg/common.h" #include "tariff_impl.h" + #include "stg_timer.h" +#include "stg/common.h" + +#include +#include // std::max //----------------------------------------------------------------------------- TARIFF_IMPL & TARIFF_IMPL::operator=(const TARIFF_DATA & td) @@ -42,12 +43,6 @@ tariffData = td; 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, @@ -148,7 +143,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 +162,6 @@ switch (GetChangePolicy()) case TARIFF::DENY: return "Current tariff '" + GetName() + "', new tariff '" + to.GetName() + "'. The policy is '" + TARIFF::ChangePolicyToString(GetChangePolicy()) + "'."; } +return ""; } //-----------------------------------------------------------------------------