Fix comilation issues for sgauth

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

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index 2086b488c68ae8ec2cd40c47d2a620e22f9e9301..aaa6a3b9ba545360b73326100245506a73f219f9 100644 (file)
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -28,60 +28,60 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-#ifndef TARIFF_H
-#define TARIFF_H
+#ifndef TARIFF_IMPL_H
+#define TARIFF_IMPL_H

 
 #include <ctime>
 
 #include <string>
 #include <list>
 
 
 #include <ctime>
 
 #include <string>
 #include <list>
 

+#include "tariff.h"

 #include "os_int.h"
 #include "tariff_conf.h"
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
 #include "os_int.h"
 #include "tariff_conf.h"
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 

-class TARIFF
-{
+class TARIFF_IMPL : public TARIFF {

 public:
 public:

-    TARIFF()
+    TARIFF_IMPL()

         : tariffData()
     {};
         : tariffData()
     {};

-    TARIFF(const std::string & name)
+    TARIFF_IMPL(const std::string & name)

         : tariffData(name)
     {};
         : tariffData(name)
     {};

-    TARIFF(const TARIFF_DATA & td)
+    TARIFF_IMPL(const TARIFF_DATA & td)

         : tariffData(td)
     {};
         : tariffData(td)
     {};

-    TARIFF(const TARIFF & t)
+    TARIFF_IMPL(const TARIFF_IMPL & t)

         : tariffData(t.tariffData)
     {};
         : tariffData(t.tariffData)
     {};

-    ~TARIFF() {};
+    virtual ~TARIFF_IMPL() {};

 
     double  GetPriceWithTraffType(uint64_t up,
                                   uint64_t down,
                                   int dir,
                                   time_t t) const;
 
     double  GetPriceWithTraffType(uint64_t up,
                                   uint64_t down,
                                   int dir,
                                   time_t t) const;

-    double  GetFreeMb() const { return tariffData.tariffConf.free; };
-    double  GetPassiveCost() const { return tariffData.tariffConf.passiveCost; };
-    double  GetFee() const { return tariffData.tariffConf.fee; };
-    double  GetFree() const { return tariffData.tariffConf.free; };
+    double  GetFreeMb() const { return tariffData.tariffConf.free; }
+    double  GetPassiveCost() const { return tariffData.tariffConf.passiveCost; }
+    double  GetFee() const { return tariffData.tariffConf.fee; }
+    double  GetFree() const { return tariffData.tariffConf.free; }

 
 

-    void    PrintTariff() const;
+    void    Print() const;

 
 

-    const   std::string & GetName() const { return tariffData.tariffConf.name; };
-    void    SetName(const std::string & name) { tariffData.tariffConf.name = name; };
+    const   std::string & GetName() const { return tariffData.tariffConf.name; }
+    void    SetName(const std::string & name) { tariffData.tariffConf.name = name; }

 
 

-    int     GetTraffType() const { return tariffData.tariffConf.traffType; };
+    int     GetTraffType() const { return tariffData.tariffConf.traffType; }

     int64_t GetTraffByType(uint64_t up, uint64_t down) const;
     int     GetThreshold(int dir) const;
     int64_t GetTraffByType(uint64_t up, uint64_t down) const;
     int     GetThreshold(int dir) const;

-    void    GetTariffData(TARIFF_DATA * td) const;
+    const TARIFF_DATA & GetTariffData() const { return tariffData; }

 
     TARIFF & operator=(const TARIFF_DATA & td);
     TARIFF & operator=(const TARIFF & t);
 
     TARIFF & operator=(const TARIFF_DATA & td);
     TARIFF & operator=(const TARIFF & t);

-    bool     operator==(const TARIFF & rhs) const { return GetName() == rhs.GetName(); };
-    bool     operator!=(const TARIFF & rhs) const { return GetName() != rhs.GetName(); };
+    bool     operator==(const TARIFF & rhs) const { return GetName() == rhs.GetName(); }
+    bool     operator!=(const TARIFF & rhs) const { return GetName() != rhs.GetName(); }

 
 private:
     TARIFF_DATA     tariffData;
 
 private:
     TARIFF_DATA     tariffData;


@@ -89,6 +89,5 @@ private:
     double  GetPriceWithoutFreeMb(int dir, int mb, time_t t) const;
     int     Interval(int dir, time_t t) const;
 };
     double  GetPriceWithoutFreeMb(int dir, int mb, time_t t) const;
     int     Interval(int dir, time_t t) const;
 };

-//-----------------------------------------------------------------------------

 
 #endif
 
 #endif