Fix funtests to work with the new build system.

[stg.git] / include / stg / tariff.h

diff --git a/include/stg/tariff.h b/include/stg/tariff.h
index 879c4ecc9e3e7f1a5b1ddca3913ee45d9d069400..6f9d87679f8219d36713dc9e41f480b31f6e78ad 100644 (file)
--- a/include/stg/tariff.h
+++ b/include/stg/tariff.h
@@ -21,12 +21,11 @@
 #ifndef TARIFF_H
 #define TARIFF_H
 
 #ifndef TARIFF_H
 #define TARIFF_H
 

-#include "os_int.h"
-

 #include <string>
 #include <string>

+#include <istream>

 #include <cstring>
 #include <ctime>
 #include <cstring>
 #include <ctime>

-#include <istream>
+#include <cstdint>

 
 struct TARIFF_DATA;
 
 
 struct TARIFF_DATA;
 


@@ -59,6 +58,7 @@ public:
     virtual double  GetFree() const = 0;
     virtual PERIOD  GetPeriod() const = 0;
     virtual CHANGE_POLICY GetChangePolicy() const = 0;
     virtual double  GetFree() const = 0;
     virtual PERIOD  GetPeriod() const = 0;
     virtual CHANGE_POLICY GetChangePolicy() const = 0;

+    virtual time_t  GetChangePolicyTimeout() const = 0;

 
     virtual const   std::string & GetName() const = 0;
     virtual void    SetName(const std::string & name) = 0;
 
     virtual const   std::string & GetName() const = 0;
     virtual void    SetName(const std::string & name) = 0;


@@ -67,6 +67,7 @@ public:
     virtual int64_t GetTraffByType(uint64_t up, uint64_t down) const = 0;
     virtual int     GetThreshold(int dir) const = 0;
     virtual const TARIFF_DATA & GetTariffData() const = 0;
     virtual int64_t GetTraffByType(uint64_t up, uint64_t down) const = 0;
     virtual int     GetThreshold(int dir) const = 0;
     virtual const TARIFF_DATA & GetTariffData() const = 0;

+    virtual std::string TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const = 0;

 };
 
 inline
 };
 
 inline