Fix compilation issues on FreeBSD4

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

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index 5fce068ec30367f54e2e135472b4daa871ae3af8..b8aac298bf03788394f99dd7a641a917bd8d4e19 100644 (file)
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -33,49 +33,48 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-#ifndef TARIFFS_H
-#define TARIFFS_H
+#ifndef TARIFFS_IMPL_H
+#define TARIFFS_IMPL_H

 
 #include <pthread.h>
 
 #include <string>
 #include <list>
 
 
 #include <pthread.h>
 
 #include <string>
 #include <list>
 

-#include "tariff.h"
-#include "tariff_conf.h"
+#include "stg/tariff.h"
+#include "stg/tariffs.h"
+#include "stg/tariff_conf.h"
+#include "tariff_impl.h"

 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 

-class BASE_STORE;
+class STORE;

 class STG_LOGGER;
 class ADMIN;
 
 class STG_LOGGER;
 class ADMIN;
 

-//-----------------------------------------------------------------------------
-class TARIFFS
-{
+class TARIFFS_IMPL : public TARIFFS {

 public:
 public:

-    TARIFFS(BASE_STORE * store);
-    ~TARIFFS();
+    TARIFFS_IMPL(STORE * store);
+    virtual ~TARIFFS_IMPL();

     int     ReadTariffs ();
     const TARIFF * FindByName(const std::string & name) const;
     const TARIFF * GetNoTariff() const { return &noTariff; };
     int     GetTariffsNum() const;
     int     ReadTariffs ();
     const TARIFF * FindByName(const std::string & name) const;
     const TARIFF * GetNoTariff() const { return &noTariff; };
     int     GetTariffsNum() const;

-    int     Del(const std::string & name, const ADMIN & admin);
-    int     Add(const std::string & name, const ADMIN & admin);
-    int     Chg(const TARIFF_DATA & td, const ADMIN & admin);
+    int     Del(const std::string & name, const ADMIN * admin);
+    int     Add(const std::string & name, const ADMIN * admin);
+    int     Chg(const TARIFF_DATA & td, const ADMIN * admin);

 
     void    GetTariffsData(std::list<TARIFF_DATA> * tdl);
 
 
     void    GetTariffsData(std::list<TARIFF_DATA> * tdl);
 

-    const std::string & GetStrError() const { return strError; };
+    const std::string & GetStrError() const { return strError; }

 private:
 private:

-    std::list<TARIFF>   tariffs;
-    BASE_STORE *        store;
-    STG_LOGGER &        WriteServLog;
+    std::list<TARIFF_IMPL>  tariffs;
+    STORE *                 store;
+    STG_LOGGER &            WriteServLog;

     mutable pthread_mutex_t mutex;
     mutable pthread_mutex_t mutex;

-    std::string         strError;
-    TARIFF              noTariff;
+    std::string             strError;
+    TARIFF_IMPL             noTariff;

 };
 };

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

 
 #endif
 
 #endif