Merge pull request #138 from Spudz76/pr-mo-fix-MODE_AUTO_ETH

Pool.h: missing ifdef like everywhere else MODE_AUTO_ETH is used

src/base/net/stratum/Pool.h

@@ -46,7 +46,7 @@ public:
         MODE_POOL,
         MODE_DAEMON,
         MODE_SELF_SELECT,
-#       ifdef XMRIG_ALGO_KAWPOW
+#       if defined XMRIG_ALGO_KAWPOW || defined XMRIG_ALGO_GHOSTRIDER
         MODE_AUTO_ETH,
 #       endif
 #       ifdef XMRIG_FEATURE_BENCHMARK
@@ -155,7 +155,7 @@ private:
     bool m_submitToOrigin           = false;
     Coin m_coin;
     int m_keepAlive                 = 0;
-#   ifdef XMRIG_ALGO_KAWPOW
+#   if defined XMRIG_ALGO_KAWPOW || defined XMRIG_ALGO_GHOSTRIDER
     Mode m_mode                     = MODE_AUTO_ETH;
 #   else
     Mode m_mode                     = MODE_POOL;

src/core/MoBenchmark.h

@@ -35,17 +35,10 @@ class Job;
 class MoBenchmark : public IJobResultListener {
 
         const Algorithm::Id bench_algos[15] = {
-#           ifdef XMRIG_ALGO_GHOSTRIDER
-            Algorithm::FLEX_KCN,
-            Algorithm::GHOSTRIDER_RTM,
-#           endif
             Algorithm::CN_R,
 #           ifdef XMRIG_ALGO_CN_LITE
             Algorithm::CN_LITE_1,
 #           endif
-#           ifdef XMRIG_ALGO_CN_HEAVY
-            Algorithm::CN_HEAVY_XHV,
-#           endif
 #           ifdef XMRIG_ALGO_CN_PICO
             Algorithm::CN_PICO_0,
 #           endif
@@ -58,6 +51,15 @@ class MoBenchmark : public IJobResultListener {
 #           endif
 #           ifdef XMRIG_ALGO_KAWPOW
             Algorithm::KAWPOW_RVN,
+#           endif
+            // below here use prefetch-disabled MSR setup, keep them grouped
+            // so MSR setting doesn't have to flip back and forth
+#           ifdef XMRIG_ALGO_GHOSTRIDER
+            Algorithm::FLEX_KCN,
+            Algorithm::GHOSTRIDER_RTM,
+#           endif
+#           ifdef XMRIG_ALGO_CN_HEAVY
+            Algorithm::CN_HEAVY_XHV,
 #           endif
 #           ifdef XMRIG_ALGO_RANDOMX
             Algorithm::RX_0,