Re-organized includes.

diff --git a/include/stg/user.h b/include/stg/user.h
index 1fa4920179e6a2a55505c9f14be141db9d17c61e..44d3e5b2293988020425518bcceaabd5ef84a7b2 100644 (file)
--- a/include/stg/user.h
+++ b/include/stg/user.h
@@ -21,17 +21,16 @@
 #ifndef USER_H
 #define USER_H
 
 #ifndef USER_H
 #define USER_H
 

-#include <ctime>
-#include <string>
-
-#include <vector>
-#include <string>
-
-#include "os_int.h"

 #include "notifer.h"
 #include "message.h"
 #include "tariff.h"
 #include "user_traff.h"
 #include "notifer.h"
 #include "message.h"
 #include "tariff.h"
 #include "user_traff.h"

+#include "os_int.h"
+
+#include <vector>
+#include <string>
+
+#include <ctime>

 
 class USER_PROPERTIES;
 class AUTH;
 
 class USER_PROPERTIES;
 class AUTH;

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index f6bf007003c4f541a976ea822c86f864393ce3fa..4f216b06e561674dc8f96c5d570e61ba7ef7f988 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -32,14 +32,9 @@
 #define _GNU_SOURCE
 #endif
 
 #define _GNU_SOURCE
 #endif
 

-#include <pthread.h>
-#include <unistd.h> // access
-
-#include <cassert>
-#include <cstdlib>
-#include <cmath>
-#include <algorithm>
-#include <functional>
+#include "user_impl.h"
+#include "settings_impl.h"
+#include "stg_timer.h"

 
 #include "stg/users.h"
 #include "stg/common.h"
 
 #include "stg/users.h"
 #include "stg/common.h"


@@ -47,9 +42,16 @@
 #include "stg/tariff.h"
 #include "stg/tariffs.h"
 #include "stg/admin.h"
 #include "stg/tariff.h"
 #include "stg/tariffs.h"
 #include "stg/admin.h"

-#include "user_impl.h"
-#include "settings_impl.h"
-#include "stg_timer.h"
+
+#include <algorithm>
+#include <functional>
+
+#include <cassert>
+#include <cstdlib>
+#include <cmath>
+
+#include <pthread.h>
+#include <unistd.h> // access

 
 #ifdef USE_ABSTRACT_SETTINGS
 USER_IMPL::USER_IMPL(const SETTINGS * s,
 
 #ifdef USE_ABSTRACT_SETTINGS
 USER_IMPL::USER_IMPL(const SETTINGS * s,

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 412816c34154a67716208fe8b620fb3c3cecfa3c..96317f06f369181d7317f2341cfc14c7a3f7a580 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -27,15 +27,7 @@
 #ifndef USER_IMPL_H
 #define USER_IMPL_H
 
 #ifndef USER_IMPL_H
 #define USER_IMPL_H
 

-#include <ctime>
-#include <list>
-#include <vector>
-#include <string>
-#include <set>
-

 #include "stg/user.h"
 #include "stg/user.h"

-#include "stg/os_int.h"
-#include "stg/const.h"

 #include "stg/user_stat.h"
 #include "stg/user_conf.h"
 #include "stg/user_ips.h"
 #include "stg/user_stat.h"
 #include "stg/user_conf.h"
 #include "stg/user_ips.h"


@@ -43,6 +35,15 @@
 #include "stg/auth.h"
 #include "stg/message.h"
 #include "stg/noncopyable.h"
 #include "stg/auth.h"
 #include "stg/message.h"
 #include "stg/noncopyable.h"

+#include "stg/os_int.h"
+#include "stg/const.h"
+
+#include <list>
+#include <vector>
+#include <string>
+#include <set>
+
+#include <ctime>

 
 //-----------------------------------------------------------------------------
 class TARIFF;
 
 //-----------------------------------------------------------------------------
 class TARIFF;