git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finalize transition to Boost.UnitTest.
[stg.git]
/
projects
/
stargazer
/
plugins
/
configuration
/
sgconfig
/
stgconfig.h
diff --git
a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h
index b7684e3390909e79cfcf6d0d8be99aaedb384cbe..f4f94ee8391aa354973a83c5c703f2639279d610 100644
(file)
--- 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 <string>
#include "stg/logger.h"
#include <string>
-
-#include <pthread.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
class STG_CONFIG_SETTINGS
{
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);
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;
mutable std::string errorStr;
STG_CONFIG_SETTINGS stgConfigSettings;
-
pthread_t
thread;
+
std::jthread m_
thread;
bool nonstop;
bool isRunning;
STG::PluginLogger logger;
bool nonstop;
bool isRunning;
STG::PluginLogger logger;