Merge remote-tracking branch 'origin/master' into ticket37

[stg.git] / projects / stargazer / plugins / store / firebird / firebird_store_utils.cpp

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store_utils.cpp b/projects/stargazer/plugins/store/firebird/firebird_store_utils.cpp
index 9f7fe6b8215e0790171d8c764127cacbc0f0bdc2..96eb817d64b8e24f78128b81013a8eeeb2ddf22f 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store_utils.cpp
+++ b/projects/stargazer/plugins/store/firebird/firebird_store_utils.cpp
@@ -29,10 +29,10 @@
 #include <cstdio>
 
 #include "firebird_store.h"
-#include "ibpp.h"
+#include "stg/ibpp.h"
 
 //-----------------------------------------------------------------------------
-time_t FIREBIRD_STORE::ts2time_t(const IBPP::Timestamp & ts) const
+time_t ts2time_t(const IBPP::Timestamp & ts)
 {
     char buf[32];
     int year, month, day, hour, min, sec;
@@ -47,7 +47,7 @@ time_t FIREBIRD_STORE::ts2time_t(const IBPP::Timestamp & ts) const
     return mktime(&time_tm);
 }
 //-----------------------------------------------------------------------------
-void FIREBIRD_STORE::time_t2ts(time_t t, IBPP::Timestamp * ts) const
+void time_t2ts(time_t t, IBPP::Timestamp * ts)
 {
     struct tm res;
 
@@ -56,10 +56,9 @@ void FIREBIRD_STORE::time_t2ts(time_t t, IBPP::Timestamp * ts) const
     *ts = IBPP::Timestamp(res.tm_year + 1900, res.tm_mon + 1, res.tm_mday, res.tm_hour, res.tm_min, res.tm_sec);
 }
 //-----------------------------------------------------------------------------
-void FIREBIRD_STORE::ym2date(int year, int month, IBPP::Date * date) const
+void ym2date(int year, int month, IBPP::Date * date)
 {
     date->SetDate(year + 1900, month + 1, 1);
     date->EndOfMonth();
 }
 //-----------------------------------------------------------------------------
-