git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update README.
[stg.git]
/
projects
/
stargazer
/
plugins
/
configuration
/
sgconfig
/
configproto.h
diff --git
a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
index 77219385b595c8fbb949f6361e8e20aad32d44f1..02452bddb79518c799044c284c8aae2faa0e2b93 100644
(file)
--- a/
projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/
projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@
-27,6
+27,10
@@
#include <string>
#include <deque>
#include <string>
#include <deque>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
#include <cstdint>
#include <sys/select.h>
#include <cstdint>
#include <sys/select.h>
@@
-38,8
+42,8
@@
namespace STG
struct Settings;
struct Admins;
struct Settings;
struct Admins;
-
struct
Tariffs;
-
struct
Users;
+
class
Tariffs;
+
class
Users;
struct Services;
struct Corporations;
struct Store;
struct Services;
struct Corporations;
struct Store;
@@
-67,7
+71,7
@@
public:
int Prepare();
int Stop();
const std::string & GetStrError() const { return m_errorStr; }
int Prepare();
int Stop();
const std::string & GetStrError() const { return m_errorStr; }
- void Run();
+ void Run(
std::stop_token token
);
private:
CONFIGPROTO(const CONFIGPROTO & rvalue);
private:
CONFIGPROTO(const CONFIGPROTO & rvalue);
@@
-83,7
+87,6
@@
private:
uint16_t m_port;
std::string m_bindAddress;
uint16_t m_port;
std::string m_bindAddress;
- bool m_running;
bool m_stopped;
STG::PluginLogger & m_logger;
int m_listenSocket;
bool m_stopped;
STG::PluginLogger & m_logger;
int m_listenSocket;