Merge branch 'beta' into evo

This commit is contained in:
XMRig 2019-08-10 13:12:31 +07:00
commit 3bd28ea7ac
2 changed files with 3 additions and 3 deletions

View file

@ -143,9 +143,9 @@ xmrig::CpuBackend::~CpuBackend()
} }
std::pair<size_t, size_t> xmrig::CpuBackend::hugePages() const std::pair<unsigned, unsigned> xmrig::CpuBackend::hugePages() const
{ {
std::pair<size_t, size_t> pages(0, 0); std::pair<unsigned, unsigned> pages(0, 0);
# ifdef XMRIG_ALGO_RANDOMX # ifdef XMRIG_ALGO_RANDOMX
if (d_ptr->algo.family() == Algorithm::RANDOM_X) { if (d_ptr->algo.family() == Algorithm::RANDOM_X) {

View file

@ -46,7 +46,7 @@ public:
CpuBackend(Controller *controller); CpuBackend(Controller *controller);
~CpuBackend() override; ~CpuBackend() override;
std::pair<size_t, size_t> hugePages() const; std::pair<unsigned, unsigned> hugePages() const;
protected: protected:
bool isEnabled() const override; bool isEnabled() const override;