Replace boost::scoped_ptr with std::unique_ptr.

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

diff --git a/include/stg/tariff.h b/include/stg/tariff.h
index 2fd797fde514fed8a8a276116dcb2fa066639946..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;
 


@@ -68,7 +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) const = 0;
+    virtual std::string TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const = 0;

 };
 
 inline
 };
 
 inline