X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/687631532197750696d35aa12c40406b04fb878d..82ede2a92a721d1c8f0e3fd109a2594f2096306e:/projects/stargazer/admins_impl.h

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index 9ca571e3..2ec99129 100644
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -35,10 +35,11 @@
 
 #include <list>
 #include <map>
+#include <string>
 
 #include "stg/admins.h"
 #include "stg/admin.h"
-#include "stg/stg_locker.h"
+#include "stg/locker.h"
 #include "stg/store.h"
 #include "stg/noncopyable.h"
 #include "admin_impl.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<ADMIN_IMPL>     data;
-    STORE *              store;
-    STG_LOGGER &         WriteServLog;
-    mutable map<int, const_admin_iter> searchDescriptors;
-    mutable unsigned int handle;
+    ADMIN_IMPL              stg;
+    ADMIN_IMPL              noAdmin;
+    std::list<ADMIN_IMPL>   data;
+    STORE *                 store;
+    STG_LOGGER &            WriteServLog;
+    mutable std::map<int, const_admin_iter> searchDescriptors;
+    mutable unsigned int    handle;
     mutable pthread_mutex_t mutex;
-    std::string          strError;
+    std::string             strError;
 };
 
 #endif