mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-25 13:42:54 -05:00
Code Issues Projects Releases Wiki Activity

Merged v4.3.0-beta

Browse Source
This commit is contained in:
MoneroOcean
2019-10-10 14:54:19 -07:00
parent fe76800fc8
commit 18413f26e8
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/cpu/CpuConfig.cpp
View File

@@ -43,31 +43,6 @@ static const char *kPriority = "priority";
static const char *kAsm = "asm"; static const char *kAsm = "asm";
#endif #endif
<<<<<<< HEAD
#ifdef XMRIG_ALGO_CN_GPU
static const char *kCnGPU = "cn/gpu";
#endif
#ifdef XMRIG_ALGO_CN_LITE
static const char *kCnLite = "cn-lite";
#endif
#ifdef XMRIG_ALGO_CN_HEAVY
static const char *kCnHeavy = "cn-heavy";
#endif
#ifdef XMRIG_ALGO_CN_PICO
static const char *kCnPico = "cn-pico";
#endif
#ifdef XMRIG_ALGO_RANDOMX
static const char *kRx = "rx";
static const char *kRxWOW = "rx/wow";
static const char *kDefyX = "defyx";
#endif
=======
>>>>>>> 72b7d934f615de1e17cf14453a8776e8ce0ad937
#ifdef XMRIG_ALGO_ARGON2 #ifdef XMRIG_ALGO_ARGON2
static const char *kArgon2Impl = "argon2-impl"; static const char *kArgon2Impl = "argon2-impl";
#endif #endif