X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0907aa4037b12b6b88ee24495d4577a064d4f8db..08dd72f2d8d3d7766e4fa87f01840c3ed8211091:/projects/stargazer/plugins/other/ping/ping.h diff --git a/projects/stargazer/plugins/other/ping/ping.h b/projects/stargazer/plugins/other/ping/ping.h index 9986be39..6a828112 100644 --- a/projects/stargazer/plugins/other/ping/ping.h +++ b/projects/stargazer/plugins/other/ping/ping.h @@ -10,10 +10,13 @@ #include #include +#include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#include +#pragma GCC diagnostic pop #include -#include - class PING; namespace STG @@ -92,7 +95,6 @@ friend class CHG_CURRIP_NOTIFIER_PING; friend class CHG_IPS_NOTIFIER_PING; public: PING(); - ~PING() override; void SetUsers(STG::Users * u) override { users = u; } void SetSettings(const STG::ModuleSettings & s) override { settings = s; } @@ -118,7 +120,7 @@ private: void GetUsers(); void SetUserNotifiers(UserPtr u); void UnSetUserNotifiers(UserPtr u); - static void * Run(void * d); + void Run(std::stop_token token); mutable std::string errorStr; PING_SETTINGS pingSettings; @@ -126,9 +128,8 @@ private: STG::Users * users; std::list usersList; - pthread_t thread; - pthread_mutex_t mutex; - bool nonstop; + std::jthread m_thread; + std::mutex m_mutex; bool isRunning; mutable STG_PINGER pinger;