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

15
src/core/Controller.cpp
View file

@ -23,7 +23,7 @@
*/
#include <assert.h>
#include <cassert>
#include "backend/cpu/Cpu.h"
@ -44,20 +44,9 @@ xmrig::Controller::~Controller()
}
bool xmrig::Controller::isReady() const
{
return Base::isReady() && m_network;
}
int xmrig::Controller::init()
{
Cpu::init();
const int rc = Base::init();
if (rc != 0) {
return rc;
}
Base::init();
m_network = new Network(this);
return 0;