From: Maxim Mamontov Date: Thu, 7 Apr 2011 15:45:57 +0000 (+0300) Subject: Fix stargazer compilation errors X-Git-Tag: 2.407-rc3~33 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/687631532197750696d35aa12c40406b04fb878d?hp=cebd0577708253f63fadfe046ce9b78dc84d23e6 Fix stargazer compilation errors --- diff --git a/projects/stargazer/actions.inl.h b/projects/stargazer/actions.inl.h index 37c7e86e..29dce606 100644 --- a/projects/stargazer/actions.inl.h +++ b/projects/stargazer/actions.inl.h @@ -3,7 +3,7 @@ #include -#include "stg_locker.h" +#include "stg/stg_locker.h" // Polymorphick action invocation template diff --git a/projects/stargazer/admin_impl.cpp b/projects/stargazer/admin_impl.cpp index d14bfa7d..3d5574c7 100644 --- a/projects/stargazer/admin_impl.cpp +++ b/projects/stargazer/admin_impl.cpp @@ -29,7 +29,7 @@ */ #include "admin_impl.h" -#include "common.h" +#include "stg/common.h" //----------------------------------------------------------------------------- ADMIN_IMPL::ADMIN_IMPL() diff --git a/projects/stargazer/admin_impl.h b/projects/stargazer/admin_impl.h index 8dd8a898..69f38420 100644 --- a/projects/stargazer/admin_impl.h +++ b/projects/stargazer/admin_impl.h @@ -33,10 +33,10 @@ #include -#include "admin.h" -#include "os_int.h" -#include "admin_conf.h" -#include "stg_logger.h" +#include "stg/admin.h" +#include "stg/os_int.h" +#include "stg/admin_conf.h" +#include "stg/stg_logger.h" class ADMIN_IMPL : public ADMIN { public: diff --git a/projects/stargazer/admins_impl.cpp b/projects/stargazer/admins_impl.cpp index 38d2cec0..0179910e 100644 --- a/projects/stargazer/admins_impl.cpp +++ b/projects/stargazer/admins_impl.cpp @@ -32,11 +32,11 @@ #include #include +#include "stg/admins.h" +#include "stg/admin.h" +#include "stg/common.h" #include "admins_impl.h" -#include "admins.h" -#include "admin.h" #include "admin_impl.h" -#include "common.h" using namespace std; diff --git a/projects/stargazer/admins_impl.h b/projects/stargazer/admins_impl.h index b481e25f..9ca571e3 100644 --- a/projects/stargazer/admins_impl.h +++ b/projects/stargazer/admins_impl.h @@ -36,12 +36,12 @@ #include #include -#include "admins.h" -#include "admin.h" +#include "stg/admins.h" +#include "stg/admin.h" +#include "stg/stg_locker.h" +#include "stg/store.h" +#include "stg/noncopyable.h" #include "admin_impl.h" -#include "stg_locker.h" -#include "store.h" -#include "noncopyable.h" class ADMINS_IMPL : private NONCOPYABLE, public ADMINS { public: diff --git a/projects/stargazer/eventloop.cpp b/projects/stargazer/eventloop.cpp index 4cd6074b..96c1ca4f 100644 --- a/projects/stargazer/eventloop.cpp +++ b/projects/stargazer/eventloop.cpp @@ -1,9 +1,9 @@ #include #include +#include "stg/stg_locker.h" +#include "stg/common.h" #include "eventloop.h" -#include "stg_locker.h" -#include "common.h" EVENT_LOOP::EVENT_LOOP() : ACTIONS_LIST() diff --git a/projects/stargazer/eventloop.h b/projects/stargazer/eventloop.h index e1b7f6aa..71602795 100644 --- a/projects/stargazer/eventloop.h +++ b/projects/stargazer/eventloop.h @@ -3,7 +3,7 @@ #include -#include "noncopyable.h" +#include "stg/noncopyable.h" #include "actions.h" class EVENT_LOOP : private NONCOPYABLE, diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index 6bbd7b9d..3ba9ccf3 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -40,20 +40,21 @@ #include #include +#include "stg/user.h" +#include "stg/common.h" +#include "stg/plugin.h" +#include "stg/stg_logger.h" +#include "stg/script_executer.h" +#include "stg/conffiles.h" +#include "stg/version.h" +#include "stg/pinger.h" +#include "stg_timer.h" #include "settings_impl.h" -#include "user.h" #include "users_impl.h" #include "admins_impl.h" #include "tariffs_impl.h" -#include "common.h" #include "traffcounter_impl.h" -#include "plugin.h" -#include "stg_logger.h" -#include "stg_timer.h" #include "plugin_runner.h" -#include "script_executer.h" -#include "conffiles.h" -#include "version.h" #include "store_loader.h" #include "pidfile.h" #include "eventloop.h" @@ -74,7 +75,6 @@ static bool childExited = false; set executersPid; static pid_t stgChildPid; -#include "pinger.h" //----------------------------------------------------------------------------- bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs) diff --git a/projects/stargazer/plugin_runner.cpp b/projects/stargazer/plugin_runner.cpp index be43e1ec..b93d6d0a 100644 --- a/projects/stargazer/plugin_runner.cpp +++ b/projects/stargazer/plugin_runner.cpp @@ -27,13 +27,13 @@ #include #include +#include "stg/common.h" +#include "stg/traffcounter.h" #include "plugin_runner.h" -#include "common.h" #include "settings_impl.h" #include "admins_impl.h" #include "tariffs_impl.h" #include "users_impl.h" -#include "traffcounter.h" //----------------------------------------------------------------------------- PLUGIN_RUNNER::PLUGIN_RUNNER(const std::string & pFileName, diff --git a/projects/stargazer/plugin_runner.h b/projects/stargazer/plugin_runner.h index ba90306c..412c5141 100644 --- a/projects/stargazer/plugin_runner.h +++ b/projects/stargazer/plugin_runner.h @@ -29,9 +29,9 @@ #include -#include "module_settings.h" -#include "plugin.h" -#include "os_int.h" +#include "stg/module_settings.h" +#include "stg/plugin.h" +#include "stg/os_int.h" class SETTINGS_IMPL; class ADMINS_IMPL; diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp index 14609647..361993c9 100644 --- a/projects/stargazer/settings_impl.cpp +++ b/projects/stargazer/settings_impl.cpp @@ -32,9 +32,9 @@ $Author: faust $ #include #include +#include "stg/stg_logger.h" +#include "stg/dotconfpp.h" #include "settings_impl.h" -#include "stg_logger.h" -#include "dotconfpp.h" using namespace std; diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h index a5722a90..f7ded853 100644 --- a/projects/stargazer/settings_impl.h +++ b/projects/stargazer/settings_impl.h @@ -40,10 +40,10 @@ #include #include -#include "settings.h" -#include "common.h" -#include "stg_logger.h" -#include "module_settings.h" +#include "stg/settings.h" +#include "stg/common.h" +#include "stg/stg_logger.h" +#include "stg/module_settings.h" //----------------------------------------------------------------------------- enum DETAIL_STAT_PERIOD { diff --git a/projects/stargazer/stg_timer.cpp b/projects/stargazer/stg_timer.cpp index 6d2b4b0c..fff79a39 100644 --- a/projects/stargazer/stg_timer.cpp +++ b/projects/stargazer/stg_timer.cpp @@ -3,7 +3,7 @@ #include #include -#include "common.h" +#include "stg/common.h" static int nonstop; static pthread_t thrStgTimer; diff --git a/projects/stargazer/store_loader.cpp b/projects/stargazer/store_loader.cpp index dbb6d36e..0dceb81d 100644 --- a/projects/stargazer/store_loader.cpp +++ b/projects/stargazer/store_loader.cpp @@ -30,9 +30,9 @@ #include +#include "stg/common.h" +#include "stg/store.h" #include "store_loader.h" -#include "common.h" -#include "store.h" #include "settings_impl.h" STORE_LOADER::STORE_LOADER(const SETTINGS_IMPL & settings) diff --git a/projects/stargazer/store_loader.h b/projects/stargazer/store_loader.h index a9bb3a44..c7911eea 100644 --- a/projects/stargazer/store_loader.h +++ b/projects/stargazer/store_loader.h @@ -33,8 +33,8 @@ #include -#include "module_settings.h" -#include "noncopyable.h" +#include "stg/module_settings.h" +#include "stg/noncopyable.h" class STORE; class SETTINGS_IMPL; diff --git a/projects/stargazer/tariff_impl.cpp b/projects/stargazer/tariff_impl.cpp index bfae5215..63164a27 100644 --- a/projects/stargazer/tariff_impl.cpp +++ b/projects/stargazer/tariff_impl.cpp @@ -31,9 +31,9 @@ #include #include // std::max +#include "stg/common.h" #include "tariff_impl.h" #include "stg_timer.h" -#include "common.h" //----------------------------------------------------------------------------- TARIFF & TARIFF_IMPL::operator=(const TARIFF_DATA & td) diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h index aaa6a3b9..b8d0a776 100644 --- a/projects/stargazer/tariff_impl.h +++ b/projects/stargazer/tariff_impl.h @@ -36,9 +36,9 @@ #include #include -#include "tariff.h" -#include "os_int.h" -#include "tariff_conf.h" +#include "stg/tariff.h" +#include "stg/os_int.h" +#include "stg/tariff_conf.h" #define TARIFF_DAY 0 #define TARIFF_NIGHT 1 diff --git a/projects/stargazer/tariffs_impl.cpp b/projects/stargazer/tariffs_impl.cpp index e0ef68e1..c244cb69 100644 --- a/projects/stargazer/tariffs_impl.cpp +++ b/projects/stargazer/tariffs_impl.cpp @@ -32,11 +32,11 @@ #include #include +#include "stg/stg_locker.h" +#include "stg/stg_logger.h" +#include "stg/store.h" +#include "stg/admin.h" #include "tariffs_impl.h" -#include "stg_locker.h" -#include "stg_logger.h" -#include "store.h" -#include "admin.h" using namespace std; diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h index 5778945d..b8aac298 100644 --- a/projects/stargazer/tariffs_impl.h +++ b/projects/stargazer/tariffs_impl.h @@ -41,10 +41,10 @@ #include #include -#include "tariff.h" +#include "stg/tariff.h" +#include "stg/tariffs.h" +#include "stg/tariff_conf.h" #include "tariff_impl.h" -#include "tariffs.h" -#include "tariff_conf.h" #define TARIFF_DAY 0 #define TARIFF_NIGHT 1 diff --git a/projects/stargazer/traffcounter_impl.cpp b/projects/stargazer/traffcounter_impl.cpp index e056a7a6..45ba883e 100644 --- a/projects/stargazer/traffcounter_impl.cpp +++ b/projects/stargazer/traffcounter_impl.cpp @@ -38,9 +38,9 @@ #include #include // fopen and similar +#include "stg/common.h" +#include "stg/stg_locker.h" #include "traffcounter_impl.h" -#include "common.h" -#include "stg_locker.h" #include "stg_timer.h" #define FLUSH_TIME (10) diff --git a/projects/stargazer/traffcounter_impl.h b/projects/stargazer/traffcounter_impl.h index feeb7a3d..27e7c03c 100644 --- a/projects/stargazer/traffcounter_impl.h +++ b/projects/stargazer/traffcounter_impl.h @@ -35,13 +35,13 @@ #include #include -#include "traffcounter.h" -#include "os_int.h" -#include "stg_logger.h" -#include "raw_ip_packet.h" -#include "users.h" +#include "stg/traffcounter.h" +#include "stg/os_int.h" +#include "stg/stg_logger.h" +#include "stg/raw_ip_packet.h" +#include "stg/users.h" +#include "stg/noncopyable.h" #include "actions.h" -#include "noncopyable.h" #include "eventloop.h" #define PROTOMAX (5) diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp index d720ffe5..8d648d4f 100644 --- a/projects/stargazer/user_impl.cpp +++ b/projects/stargazer/user_impl.cpp @@ -38,14 +38,14 @@ #include #include +#include "stg/users.h" +#include "stg/common.h" +#include "stg/script_executer.h" +#include "stg/tariff.h" +#include "stg/tariffs.h" +#include "stg/admin.h" #include "user_impl.h" -#include "users.h" -#include "common.h" #include "settings_impl.h" -#include "script_executer.h" -#include "tariff.h" -#include "tariffs.h" -#include "admin.h" USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s, const STORE * st, diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h index e9c9f986..935dcd0e 100644 --- a/projects/stargazer/user_impl.h +++ b/projects/stargazer/user_impl.h @@ -32,16 +32,16 @@ #include #include -#include "user.h" -#include "os_int.h" -#include "stg_const.h" -#include "user_stat.h" -#include "user_conf.h" -#include "user_ips.h" -#include "user_property.h" -#include "auth.h" -#include "stg_message.h" -#include "noncopyable.h" +#include "stg/user.h" +#include "stg/os_int.h" +#include "stg/stg_const.h" +#include "stg/user_stat.h" +#include "stg/user_conf.h" +#include "stg/user_ips.h" +#include "stg/user_property.h" +#include "stg/auth.h" +#include "stg/stg_message.h" +#include "stg/noncopyable.h" //----------------------------------------------------------------------------- class TARIFF; diff --git a/projects/stargazer/user_property.cpp b/projects/stargazer/user_property.cpp index 46990fd4..06a4901a 100644 --- a/projects/stargazer/user_property.cpp +++ b/projects/stargazer/user_property.cpp @@ -1,4 +1,4 @@ -#include "user_property.h" +#include "stg/user_property.h" //----------------------------------------------------------------------------- USER_PROPERTIES::USER_PROPERTIES(const std::string & sd) diff --git a/projects/stargazer/users_impl.cpp b/projects/stargazer/users_impl.cpp index 24955187..c139e65c 100644 --- a/projects/stargazer/users_impl.cpp +++ b/projects/stargazer/users_impl.cpp @@ -40,9 +40,9 @@ #include #include -#include "settings.h" +#include "stg/settings.h" +#include "stg/common.h" #include "users_impl.h" -#include "common.h" #include "stg_timer.h" using namespace std; diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h index 7a2fc0f9..37edef7a 100644 --- a/projects/stargazer/users_impl.h +++ b/projects/stargazer/users_impl.h @@ -36,19 +36,18 @@ $Author: faust $ #include #include -#include "os_int.h" - -#include "store.h" -#include "settings_impl.h" -#include "users.h" -#include "user.h" -#include "user_impl.h" -#include "tariffs.h" -#include "stg_logger.h" -#include "notifer.h" +#include "stg/os_int.h" +#include "stg/store.h" +#include "stg/users.h" +#include "stg/user.h" +#include "stg/tariffs.h" +#include "stg/stg_logger.h" +#include "stg/notifer.h" +#include "stg/noncopyable.h" #include "actions.h" -#include "noncopyable.h" #include "eventloop.h" +#include "settings_impl.h" +#include "user_impl.h" const int userDeleteDelayTime = 120;