Merge remote-tracking branch 'origin/master' into ticket

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

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index 788162cdd1c17ebe06f36efb6249ca67c8662e37..0619d50bb5f852f725833a6294e613b8e31c88b5 100644 (file)
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -73,6 +73,7 @@ public:
     double  GetFree() const { return tariffData.tariffConf.free; }
     PERIOD  GetPeriod() const { return tariffData.tariffConf.period; }
     CHANGE_POLICY GetChangePolicy() const { return tariffData.tariffConf.changePolicy; }
+    time_t GetChangePolicyTimeout() const { return tariffData.tariffConf.changePolicyTimeout; }
 
     void    Print() const;
 
@@ -88,7 +89,7 @@ public:
     TARIFF_IMPL & operator=(const TARIFF_IMPL & t);
     bool     operator==(const TARIFF_IMPL & rhs) const { return GetName() == rhs.GetName(); }
     bool     operator!=(const TARIFF_IMPL & rhs) const { return GetName() != rhs.GetName(); }
-    std::string TariffChangeIsAllowed(const TARIFF & to) const;
+    std::string TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const;
 
 private:
     TARIFF_DATA     tariffData;