X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0907aa4037b12b6b88ee24495d4577a064d4f8db..2196a3a0cdc5384c082febb7f4aa5994cc7d80db:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h index b7684e33..f4f94ee8 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h @@ -26,8 +26,10 @@ #include "stg/logger.h" #include - -#include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#include +#pragma GCC diagnostic pop class STG_CONFIG_SETTINGS { @@ -72,11 +74,11 @@ class STG_CONFIG : public STG::Plugin STG_CONFIG(const STG_CONFIG & rvalue); STG_CONFIG & operator=(const STG_CONFIG & rvalue); - static void * Run(void *); + void Run(std::stop_token token); mutable std::string errorStr; STG_CONFIG_SETTINGS stgConfigSettings; - pthread_t thread; + std::jthread m_thread; bool nonstop; bool isRunning; STG::PluginLogger logger;