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 xmrig v6.15.0 into master

Browse Source
This commit is contained in:
MoneroOcean
2021-08-31 17:13:03 +00:00
parent 13f721dd78
commit aceef09f1f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/base/crypto/Algorithm.cpp
View File

@@ -105,7 +105,9 @@ const char *Algorithm::kKAWPOW_RVN = "kawpow";
#ifdef XMRIG_ALGO_CN_GPU #ifdef XMRIG_ALGO_CN_GPU
const char *Algorithm::kCN_GPU = "cn/gpu"; const char *Algorithm::kCN_GPU = "cn/gpu";
#endif #endif
#ifdef XMRIG_ALGO_RANDOMX
const char *Algorithm::kRX_XLA = "panthera"; const char *Algorithm::kRX_XLA = "panthera";
#endif
#define ALGO_NAME(ALGO) { Algorithm::ALGO, Algorithm::k##ALGO } #define ALGO_NAME(ALGO) { Algorithm::ALGO, Algorithm::k##ALGO }
@@ -368,10 +370,7 @@ std::vector<xmrig::Algorithm> xmrig::Algorithm::all(const std::function<bool(con
CN_HEAVY_0, CN_HEAVY_TUBE, CN_HEAVY_XHV, CN_HEAVY_0, CN_HEAVY_TUBE, CN_HEAVY_XHV,
CN_PICO_0, CN_PICO_TLO, CN_PICO_0, CN_PICO_TLO,
CN_UPX2, CN_UPX2,
# ifdef XMRIG_ALGO_CN_GPU CN_GPU, RX_XLA,
CN_GPU,
# endif
RX_XLA,
RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA, RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA,
AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ, AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ,
ASTROBWT_DERO, ASTROBWT_DERO,