X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/e767204dbf56ac466489c142f0acdaebd5d0b935..32248221316271f3a09a771ce35b77236f4bbeed:/projects/stargazer/tariffs_impl.cpp?ds=sidebyside diff --git a/projects/stargazer/tariffs_impl.cpp b/projects/stargazer/tariffs_impl.cpp index e0ef68e1..a912c338 100644 --- a/projects/stargazer/tariffs_impl.cpp +++ b/projects/stargazer/tariffs_impl.cpp @@ -32,17 +32,18 @@ #include #include +#include "stg/locker.h" +#include "stg/logger.h" +#include "stg/store.h" +#include "stg/admin.h" #include "tariffs_impl.h" -#include "stg_locker.h" -#include "stg_logger.h" -#include "store.h" -#include "admin.h" using namespace std; //----------------------------------------------------------------------------- TARIFFS_IMPL::TARIFFS_IMPL(STORE * st) - : tariffs(), + : TARIFFS(), + tariffs(), store(st), WriteServLog(GetStgLogger()), strError(), @@ -85,7 +86,7 @@ for (int i = 0; i < tariffsNum; i++) return 0; } //----------------------------------------------------------------------------- -int TARIFFS_IMPL::GetTariffsNum() const +size_t TARIFFS_IMPL::Count() const { STG_LOCKER lock(&mutex, __FILE__, __LINE__); return tariffs.size(); @@ -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; }