mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-08 08:23:34 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'evo' into feature-hwloc

Browse Source
This commit is contained in:
XMRig
2019-07-25 13:41:51 +07:00
parent 4a32494060 f8108cf6bc
commit ccd5fae5e1
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/cpu/CpuWorker.cpp
View File

@@ -81,8 +81,9 @@ xmrig::CpuWorker<N>::~CpuWorker()
template<size_t N>
void xmrig::CpuWorker<N>::allocateRandomX_VM()
{
RxDataset *dataset = Rx::dataset(m_job.currentJob().seedHash(), m_job.currentJob().algorithm());
if (!m_vm) {
RxDataset *dataset = Rx::dataset(m_job.currentJob().seedHash(), m_job.currentJob().algorithm());
m_vm = new RxVm(dataset, m_memory->scratchpad(), !m_hwAES);
}
}

4
src/version.h
View File

@@ -28,7 +28,7 @@
#define APP_ID "xmrig"
#define APP_NAME "XMRig"
#define APP_DESC "XMRig CPU miner"
#define APP_VERSION "2.99.1-evo"
#define APP_VERSION "2.99.2-evo"
#define APP_DOMAIN "xmrig.com"
#define APP_SITE "www.xmrig.com"
#define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
@@ -36,7 +36,7 @@
#define APP_VER_MAJOR 2
#define APP_VER_MINOR 99
#define APP_VER_PATCH 1
#define APP_VER_PATCH 2
#ifdef _MSC_VER
# if (_MSC_VER >= 1920)