Fix build on Darwin.

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

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index 5fce068ec30367f54e2e135472b4daa871ae3af8..8beb36c8e9c515d3450f84bd172239df6e9a0b5b 100644 (file)
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -1,8 +1,3 @@
- /*
- $Revision: 1.7 $
- $Date: 2010/10/07 18:43:21 $
- */
-

 /*
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
 /*
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by


@@ -27,55 +22,50 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

-/*
- $Revision: 1.7 $
- $Date: 2010/10/07 18:43:21 $
- $Author: faust $
- */
-
-#ifndef TARIFFS_H
-#define TARIFFS_H
+#pragma once

 
 

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

 
 #include <string>
 
 #include <string>

-#include <list>
+#include <vector>
+#include <set>
+#include <mutex>

 
 

-#include "tariff.h"
-#include "tariff_conf.h"
+namespace STG
+{

 
 

-#define TARIFF_DAY     0
-#define TARIFF_NIGHT   1
+struct Store;
+class Logger;
+class Admin;

 
 

-class BASE_STORE;
-class STG_LOGGER;
-class ADMIN;
+class TariffsImpl : public Tariffs {
+    public:
+        using Data = std::vector<TariffImpl>;

 
 

-//-----------------------------------------------------------------------------
-class TARIFFS
-{
-public:
-    TARIFFS(BASE_STORE * store);
-    ~TARIFFS();
-    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);
+        explicit TariffsImpl(Store * store);
+
+        int ReadTariffs () override;
+        const Tariff * FindByName(const std::string & name) const override;
+        const Tariff * GetNoTariff() const override { return &noTariff; }
+        size_t Count() const override;
+        int Del(const std::string & name, const Admin * admin) override;
+        int Add(const std::string & name, const Admin * admin) override;
+        int Chg(const TariffData & td, const Admin * admin) override;
+
+        void GetTariffsData(std::vector<TariffData> * tdl) const override;

 
 

-    void    GetTariffsData(std::list<TARIFF_DATA> * tdl);
+        const std::string & GetStrError() const override { return strError; }

 
 

-    const std::string & GetStrError() const { return strError; };
-private:
-    std::list<TARIFF>   tariffs;
-    BASE_STORE *        store;
-    STG_LOGGER &        WriteServLog;
-    mutable pthread_mutex_t mutex;
-    std::string         strError;
-    TARIFF              noTariff;
+    private:
+        Data               tariffs;
+        Store*             store;
+        Logger&            WriteServLog;
+        mutable std::mutex m_mutex;
+        std::string        strError;
+        TariffImpl         noTariff;

 };
 };

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

 
 

-#endif
+}