diff options
Diffstat (limited to 'xmrstak/misc')
| -rw-r--r-- | xmrstak/misc/configEditor.hpp | 4 | ||||
| -rw-r--r-- | xmrstak/misc/console.hpp | 2 | ||||
| -rw-r--r-- | xmrstak/misc/environment.hpp | 16 | ||||
| -rw-r--r-- | xmrstak/misc/executor.cpp | 6 | ||||
| -rw-r--r-- | xmrstak/misc/executor.hpp | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/xmrstak/misc/configEditor.hpp b/xmrstak/misc/configEditor.hpp index 80607ff..3960384 100644 --- a/xmrstak/misc/configEditor.hpp +++ b/xmrstak/misc/configEditor.hpp @@ -10,11 +10,11 @@ namespace xmrstak { -struct ConfigEditor +struct configEditor { std::string m_fileContent; - ConfigEditor() + configEditor() { } diff --git a/xmrstak/misc/console.hpp b/xmrstak/misc/console.hpp index c68bba3..4d5be78 100644 --- a/xmrstak/misc/console.hpp +++ b/xmrstak/misc/console.hpp @@ -28,7 +28,7 @@ class printer public: static inline printer* inst() { - auto& env = xmrstak::Environment::inst(); + auto& env = xmrstak::environment::inst(); if(env.pPrinter == nullptr) env.pPrinter = new printer; return env.pPrinter; diff --git a/xmrstak/misc/environment.hpp b/xmrstak/misc/environment.hpp index 15f8cce..af4c12a 100644 --- a/xmrstak/misc/environment.hpp +++ b/xmrstak/misc/environment.hpp @@ -7,22 +7,22 @@ class executor; namespace xmrstak { -class GlobalStates; +class globalStates; class Params; -struct Environment +struct environment { - static Environment& inst() + static environment& inst() { - static Environment env; + static environment env; return env; } - Environment& operator=(const Environment& env) + environment& operator=(const environment& env) { this->pPrinter = env.pPrinter; - this->pGlobalStates = env.pGlobalStates; + this->pglobalStates = env.pglobalStates; this->pJconfConfig = env.pJconfConfig; this->pExecutor = env.pExecutor; this->pParams = env.pParams; @@ -30,13 +30,13 @@ struct Environment } - Environment() : pPrinter(nullptr), pGlobalStates(nullptr) + environment() : pPrinter(nullptr), pglobalStates(nullptr) { } printer* pPrinter; - GlobalStates* pGlobalStates; + globalStates* pglobalStates; jconf* pJconfConfig; executor* pExecutor; Params* pParams; diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp index 455412e..ce5fbb2 100644 --- a/xmrstak/misc/executor.cpp +++ b/xmrstak/misc/executor.cpp @@ -121,7 +121,7 @@ void executor::sched_reconnect() rt, int_port(iReconnectAttempts)); auto work = xmrstak::miner_work(); - xmrstak::GlobalStates::inst().switch_work(work); + xmrstak::globalStates::inst().switch_work(work); push_timed_event(ex_event(EV_RECONNECT, usr_pool_id), rt); } @@ -239,7 +239,7 @@ void executor::on_pool_have_job(size_t pool_id, pool_job& oPoolJob) oWork.iTarget32 = oPoolJob.iTarget32; - xmrstak::GlobalStates::inst().switch_work(oWork); + xmrstak::globalStates::inst().switch_work(oWork); if(pool_id == dev_pool_id) return; @@ -361,7 +361,7 @@ void executor::on_switch_pool(size_t pool_id) oWork.iTarget32 = oPoolJob.iTarget32; - xmrstak::GlobalStates::inst().switch_work(oWork); + xmrstak::globalStates::inst().switch_work(oWork); if(dev_pool->is_running()) push_timed_event(ex_event(EV_DEV_POOL_EXIT), 5); diff --git a/xmrstak/misc/executor.hpp b/xmrstak/misc/executor.hpp index 8be5f56..d705c27 100644 --- a/xmrstak/misc/executor.hpp +++ b/xmrstak/misc/executor.hpp @@ -28,7 +28,7 @@ class executor public: static executor* inst() { - auto& env = xmrstak::Environment::inst(); + auto& env = xmrstak::environment::inst(); if(env.pExecutor == nullptr) env.pExecutor = new executor; return env.pExecutor; @@ -67,7 +67,7 @@ private: thdq<ex_event> oEventQ; xmrstak::telemetry* telem; - std::vector<xmrstak::IBackend*>* pvThreads; + std::vector<xmrstak::iBackend*>* pvThreads; size_t current_pool_id; |
