fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved conflicts

Browse source
This commit is contained in:
MoneroOcean 2019-09-28 20:26:20 -07:00
commit d03fb91b0a
82 changed files with 3489 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/Controller.h
View file

@ -27,6 +27,7 @@
#include "base/kernel/Base.h"
#include "base/tools/Object.h"
namespace xmrig {
@ -40,10 +41,11 @@ class Network;
class Controller : public Base
{
public:
XMRIG_DISABLE_COPY_MOVE_DEFAULT(Controller)
Controller(Process *process);
~Controller() override;
bool isReady() const override;
int init() override;
void pre_start();
void start() override;