X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c0fff5a4f4e765e5bb9f01a5d380cbdc098d04e6..9ac51161f6093558c61f3edaa134831df2b5b38c:/projects/stargazer/plugins/other/rscript/rscript.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp index 74bf87a1..1e842d25 100644 --- a/projects/stargazer/plugins/other/rscript/rscript.cpp +++ b/projects/stargazer/plugins/other/rscript/rscript.cpp @@ -19,14 +19,10 @@ * Author : Maxim Mamontov */ -#include +#include "rscript.h" -#include -#include -#include -#include -#include -#include +#include "ur_functor.h" +#include "send_functor.h" #include "stg/common.h" #include "stg/locker.h" @@ -34,9 +30,17 @@ #include "stg/user_property.h" #include "stg/plugin_creator.h" #include "stg/logger.h" -#include "rscript.h" -#include "ur_functor.h" -#include "send_functor.h" + +#include + +#include +#include +#include +#include +#include + +#include +#include extern volatile time_t stgTime; @@ -47,7 +51,7 @@ namespace { template struct USER_IS { - USER_IS(USER_PTR u) : user(u) {} + explicit USER_IS(USER_PTR u) : user(u) {} bool operator()(const T & notifier) { return notifier.GetUser() == user; } USER_PTR user; @@ -296,7 +300,7 @@ if (isRunning) return 0; } //----------------------------------------------------------------------------- -int REMOTE_SCRIPT::Reload(const MODULE_SETTINGS & ms) +int REMOTE_SCRIPT::Reload(const MODULE_SETTINGS & /*ms*/) { NRMapParser nrMapParser;