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

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

diff --git a/projects/stargazer/corps_impl.h b/projects/stargazer/corps_impl.h
index e4552424219c72e3aab74b25dacb69649456451f..3765c5c1959aa67a9022e43949b6cb8f58d33615 100644 (file)
--- a/projects/stargazer/corps_impl.h
+++ b/projects/stargazer/corps_impl.h
@@ -21,12 +21,6 @@
 #ifndef CORPORATIONS_IMPL_H
 #define CORPORATIONS_IMPL_H
 
 #ifndef CORPORATIONS_IMPL_H
 #define CORPORATIONS_IMPL_H
 

-#include <pthread.h>
-
-#include <list>
-#include <map>
-#include <string>
-

 #include "stg/corporations.h"
 #include "stg/corp_conf.h"
 #include "stg/locker.h"
 #include "stg/corporations.h"
 #include "stg/corp_conf.h"
 #include "stg/locker.h"


@@ -34,11 +28,17 @@
 #include "stg/noncopyable.h"
 #include "stg/logger.h"
 
 #include "stg/noncopyable.h"
 #include "stg/logger.h"
 

+#include <list>
+#include <map>
+#include <string>
+
+#include <pthread.h>
+

 class ADMIN;
 
 class CORPORATIONS_IMPL : private NONCOPYABLE, public CORPORATIONS {
 public:
 class ADMIN;
 
 class CORPORATIONS_IMPL : private NONCOPYABLE, public CORPORATIONS {
 public:

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

     virtual ~CORPORATIONS_IMPL() {}
 
     int Add(const CORP_CONF & corp, const ADMIN * admin);
     virtual ~CORPORATIONS_IMPL() {}
 
     int Add(const CORP_CONF & corp, const ADMIN * admin);


@@ -58,8 +58,8 @@ private:
     CORPORATIONS_IMPL(const CORPORATIONS_IMPL & rvalue);
     CORPORATIONS_IMPL & operator=(const CORPORATIONS_IMPL & rvalue);
 
     CORPORATIONS_IMPL(const CORPORATIONS_IMPL & rvalue);
     CORPORATIONS_IMPL & operator=(const CORPORATIONS_IMPL & rvalue);
 

-    typedef list<CORP_CONF>::iterator       crp_iter;
-    typedef list<CORP_CONF>::const_iterator const_crp_iter;
+    typedef std::list<CORP_CONF>::iterator       crp_iter;
+    typedef std::list<CORP_CONF>::const_iterator const_crp_iter;

 
     bool Read();
 
 
     bool Read();