From: Maxim Mamontov Date: Sat, 13 Aug 2011 12:43:05 +0000 (+0300) Subject: Fix some headers in admins implementation X-Git-Tag: 2.408-alpha~37 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/9ff682964a02109507959c858c2571e1e6780ee8?ds=sidebyside Fix some headers in admins implementation --- diff --git a/projects/stargazer/admins_impl.cpp b/projects/stargazer/admins_impl.cpp index 3fe2c10b..53775717 100644 --- a/projects/stargazer/admins_impl.cpp +++ b/projects/stargazer/admins_impl.cpp @@ -32,8 +32,6 @@ #include #include -#include "stg/admins.h" -#include "stg/admin.h" #include "stg/common.h" #include "admins_impl.h" #include "admin_impl.h" diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h index 170f3a4f..2ec99129 100644 --- a/projects/stargazer/admins_impl.h +++ b/projects/stargazer/admins_impl.h @@ -35,6 +35,7 @@ #include #include +#include #include "stg/admins.h" #include "stg/admin.h" @@ -48,8 +49,8 @@ public: ADMINS_IMPL(STORE * st); virtual ~ADMINS_IMPL() {} - int Add(const string & login, const ADMIN * admin); - int Del(const string & login, const ADMIN * admin); + int Add(const std::string & login, const ADMIN * admin); + int Del(const std::string & login, const ADMIN * admin); int Change(const ADMIN_CONF & ac, const ADMIN * admin); void PrintAdmins() const; const ADMIN * GetSysAdmin() const { return &stg; } @@ -71,15 +72,15 @@ private: int ReadAdmins(); - ADMIN_IMPL stg; - ADMIN_IMPL noAdmin; - list data; - STORE * store; - STG_LOGGER & WriteServLog; - mutable map searchDescriptors; - mutable unsigned int handle; + ADMIN_IMPL stg; + ADMIN_IMPL noAdmin; + std::list data; + STORE * store; + STG_LOGGER & WriteServLog; + mutable std::map searchDescriptors; + mutable unsigned int handle; mutable pthread_mutex_t mutex; - std::string strError; + std::string strError; }; #endif