Merge remote-tracking branch 'github/master'

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

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index 7b6f900adc1209d345289084034a65dc8d0890c6..07c0e8ab9264a161166d26203bfe810fe2575475 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -20,7 +20,14 @@
 
 #pragma once
 
-#include <pthread.h>
+#include "settings_impl.h"
+#include "user_impl.h"
+#include "stg/store.h"
+#include "stg/users.h"
+#include "stg/user.h"
+#include "stg/tariffs.h"
+#include "stg/logger.h"
+#include "stg/noncopyable.h"
 
 #include <string>
 #include <map>
@@ -34,16 +41,6 @@
 #include <ctime>
 #include <cstdint>
 
-#include "stg/store.h"
-#include "stg/users.h"
-#include "stg/user.h"
-#include "stg/tariffs.h"
-#include "stg/logger.h"
-#include "stg/notifer.h"
-#include "stg/noncopyable.h"
-#include "settings_impl.h"
-#include "user_impl.h"
-
 namespace STG
 {
 
@@ -52,7 +49,6 @@ const int userDeleteDelayTime = 120;
 typedef std::list<UserImpl>::iterator user_iter;
 typedef std::list<UserImpl>::const_iterator const_user_iter;
 
-class UsersImpl;
 //-----------------------------------------------------------------------------
 struct USER_TO_DEL {
 USER_TO_DEL()
@@ -66,9 +62,6 @@ time_t  delTime;
 //-----------------------------------------------------------------------------
 class UsersImpl : public Users
 {
-    friend class PROPERTY_NOTIFER_IP_BEFORE;
-    friend class PROPERTY_NOTIFER_IP_AFTER;
-
     public:
         using UserImplPtr = UserImpl*;