Merge branch 'master' into full-month-stats

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

diff --git a/projects/stargazer/tariffs_impl.cpp b/projects/stargazer/tariffs_impl.cpp
index c244cb692ac8907bd73c4ff5f37403467282be1b..d2ea7c9a049ae9c2d606deed6b26c2aa9621db8c 100644 (file)
--- a/projects/stargazer/tariffs_impl.cpp
+++ b/projects/stargazer/tariffs_impl.cpp
@@ -32,8 +32,8 @@
 #include <algorithm>
 #include <vector>
 
-#include "stg/stg_locker.h"
-#include "stg/stg_logger.h"
+#include "stg/locker.h"
+#include "stg/logger.h"
 #include "stg/store.h"
 #include "stg/admin.h"
 #include "tariffs_impl.h"
@@ -42,7 +42,8 @@ using namespace std;
 
 //-----------------------------------------------------------------------------
 TARIFFS_IMPL::TARIFFS_IMPL(STORE * st)
-    : tariffs(),
+    : TARIFFS(),
+      tariffs(),
       store(st),
       WriteServLog(GetStgLogger()),
       strError(),
@@ -206,7 +207,7 @@ ti = find(tariffs.begin(), tariffs.end(), TARIFF_IMPL(name));
 
 if (ti != tariffs.end())
     {
-    strError = "Tariff \'" + name + "\' cannot be added. Tariff alredy exist.";
+    strError = "Tariff \'" + name + "\' cannot be added. Tariff already exist.";
     WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
     return -1;
     }