Fix some headers in admins implementation

diff --git a/projects/stargazer/admins_impl.cpp b/projects/stargazer/admins_impl.cpp
index 3fe2c10b6c6c423629ee25ea2bd416a921449fb9..53775717700899a1c332179a336d19e4d2069175 100644 (file)
--- a/projects/stargazer/admins_impl.cpp
+++ b/projects/stargazer/admins_impl.cpp
@@ -32,8 +32,6 @@
 #include <cassert>
 #include <algorithm>
 
 #include <cassert>
 #include <algorithm>
 

-#include "stg/admins.h"
-#include "stg/admin.h"

 #include "stg/common.h"
 #include "admins_impl.h"
 #include "admin_impl.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 170f3a4f3cb74a01ea9fcbb648fc5b94fe4ab6a7..2ec9912913fcb8235cc9a73c4f1f146d8a4a6330 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -35,6 +35,7 @@
 
 #include <list>
 #include <map>
 
 #include <list>
 #include <map>

+#include <string>

 
 #include "stg/admins.h"
 #include "stg/admin.h"
 
 #include "stg/admins.h"
 #include "stg/admin.h"


@@ -48,8 +49,8 @@ public:
     ADMINS_IMPL(STORE * st);
     virtual ~ADMINS_IMPL() {}
 
     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; }
     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();
 
 
     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;
     mutable pthread_mutex_t mutex;

-    std::string          strError;
+    std::string             strError;

 };
 
 #endif
 };
 
 #endif