Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / store / firebird / firebird_store.h

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.h b/projects/stargazer/plugins/store/firebird/firebird_store.h
index 2bd094bd3bf043859c655ccb2538a8b7a646d551..58054cba724b0cc67c34738d8e4cd8f80cf8c253 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.h
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.h
@@ -35,7 +35,7 @@
 #include <map>
 
 #include "stg/store.h"
 #include <map>
 
 #include "stg/store.h"

-#include "stg/stg_locker.h"
+#include "stg/locker.h"

 #include "stg/ibpp.h"
 
 struct ToLower {
 #include "stg/ibpp.h"
 
 struct ToLower {


@@ -114,7 +114,11 @@ public:
     int RestoreService(SERVICE_CONF * sc, const std::string & name) const;
     int AddService(const std::string & name) const;
     int DelService(const std::string & name) const;
     int RestoreService(SERVICE_CONF * sc, const std::string & name) const;
     int AddService(const std::string & name) const;
     int DelService(const std::string & name) const;

+

 private:
 private:

+    FIREBIRD_STORE(const FIREBIRD_STORE & rvalue);
+    FIREBIRD_STORE & operator=(const FIREBIRD_STORE & rvalue);
+

     std::string version;
     mutable std::string strError;
     mutable std::string db_server, db_database, db_user, db_password;
     std::string version;
     mutable std::string strError;
     mutable std::string db_server, db_database, db_user, db_password;


@@ -127,8 +131,8 @@ private:
     int SaveStat(const USER_STAT & stat, const std::string & login, int year = 0, int month = 0) const;
 };
 
     int SaveStat(const USER_STAT & stat, const std::string & login, int year = 0, int month = 0) const;
 };
 

-time_t ts2time_t(const IBPP::Timestamp & ts) const;
-void time_t2ts(time_t t, IBPP::Timestamp * ts) const;
-void ym2date(int year, int month, IBPP::Date * date) const;
+time_t ts2time_t(const IBPP::Timestamp & ts);
+void time_t2ts(time_t t, IBPP::Timestamp * ts);
+void ym2date(int year, int month, IBPP::Date * date);

 
 #endif //FIREBIRD_STORE_H
 
 #endif //FIREBIRD_STORE_H