Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / admins_impl.h

diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h
index cb00368c18543d75c9a72e596d8f6d6b993f6587..03aa4ece97ed9a14463e9c511d66ed928635d6ea 100644 (file)
--- a/projects/stargazer/admins_impl.h
+++ b/projects/stargazer/admins_impl.h
@@ -31,11 +31,7 @@
 #ifndef ADMINS_IMPL_H
 #define ADMINS_IMPL_H
 
 #ifndef ADMINS_IMPL_H
 #define ADMINS_IMPL_H
 

-#include <pthread.h>
-
-#include <list>
-#include <map>
-#include <string>
+#include "admin_impl.h"

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


@@ -43,17 +39,21 @@
 #include "stg/store.h"
 #include "stg/noncopyable.h"
 #include "stg/logger.h"
 #include "stg/store.h"
 #include "stg/noncopyable.h"
 #include "stg/logger.h"

-#include "admin_impl.h"
+
+#include <list>
+#include <map>
+#include <string>
+
+#include <pthread.h>

 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:
 
 class ADMINS_IMPL : private NONCOPYABLE, public ADMINS {
 public:

-    ADMINS_IMPL(STORE * st);
+    explicit ADMINS_IMPL(STORE * st);

     virtual ~ADMINS_IMPL() {}
 
     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);
     virtual ~ADMINS_IMPL() {}
 
     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; }
     const ADMIN * GetNoAdmin() const { return &noAdmin; }
     bool          Find(const std::string & l, ADMIN ** admin);
     const ADMIN * GetSysAdmin() const { return &stg; }
     const ADMIN * GetNoAdmin() const { return &noAdmin; }
     bool          Find(const std::string & l, ADMIN ** admin);


@@ -73,8 +73,8 @@ private:
     ADMINS_IMPL(const ADMINS_IMPL & rvalue);
     ADMINS_IMPL & operator=(const ADMINS_IMPL & rvalue);
 
     ADMINS_IMPL(const ADMINS_IMPL & rvalue);
     ADMINS_IMPL & operator=(const ADMINS_IMPL & rvalue);
 

-    typedef list<ADMIN_IMPL>::iterator admin_iter;
-    typedef list<ADMIN_IMPL>::const_iterator const_admin_iter;
+    typedef std::list<ADMIN_IMPL>::iterator admin_iter;
+    typedef std::list<ADMIN_IMPL>::const_iterator const_admin_iter;

 
     int             Read();
 
 
     int             Read();