]> git.stg.codes - stg.git/blobdiff - projects/stargazer/plugins/store/firebird/firebird_store_users.cpp
Merge branch 'master' into full-month-stats
[stg.git] / projects / stargazer / plugins / store / firebird / firebird_store_users.cpp
index 035ae134e3385fa8348c7114b708b39ca69c34f3..a31ca3f80c5c9921c77d1fadc5ed5bb667f2c63b 100644 (file)
@@ -26,9 +26,9 @@
  *
  */
 
-#include "stg_const.h"
+#include "stg/const.h"
 #include "firebird_store.h"
-#include "ibpp.h"
+#include "stg/ibpp.h"
 
 //-----------------------------------------------------------------------------
 int FIREBIRD_STORE::GetUsersList(vector<string> * usersList) const
@@ -717,7 +717,7 @@ catch (IBPP::Exception & ex)
 return 0;
 }
 //-----------------------------------------------------------------------------
-int FIREBIRD_STORE::WriteDetailedStat(const map<IP_DIR_PAIR, STAT_NODE> * statTree,
+int FIREBIRD_STORE::WriteDetailedStat(const map<IP_DIR_PAIR, STAT_NODE> & statTree,
                                       time_t lastStat,
                                       const string & login) const
 {
@@ -735,14 +735,14 @@ try
     {
     tr->Start();
     map<IP_DIR_PAIR, STAT_NODE>::const_iterator it;
-    it = statTree->begin();
+    it = statTree.begin();
     st->Prepare("insert into tb_detail_stats \
                     (till_time, from_time, fk_user, dir_num, \
                      ip, download, upload, cost) \
                  values (?, ?, (select pk_user from tb_users \
                                 where name = ?), \
                      ?, ?, ?, ?, ?)");
-    while (it != statTree->end())
+    while (it != statTree.end())
         {
         st->Set(1, now);
         st->Set(2, statTime);