From 945a9cbcb9efc8e4f24f4dad47fce0de66546ab1 Mon Sep 17 00:00:00 2001
From: MoneroOcean <support@moneroocean.stream>
Date: Sat, 14 Aug 2021 20:33:50 +0000
Subject: [PATCH] Merge xmrig v6.14.1 into master

---
 src/core/MoBenchmark.cpp | 4 ++--
 src/core/MoBenchmark.h   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/MoBenchmark.cpp b/src/core/MoBenchmark.cpp
index e433783f..0f4d467d 100644
--- a/src/core/MoBenchmark.cpp
+++ b/src/core/MoBenchmark.cpp
@@ -58,7 +58,7 @@ void MoBenchmark::start() {
 
 // end of benchmarks, switch to jobs from the pool (network), fill algo_perf
 void MoBenchmark::finish() {
-    for (Algorithm::Id algo = Algorithm::MIN; algo != Algorithm::MAX; algo = static_cast<Algorithm::Id>(algo + 1)) {
+    for (const Id algo : Algorithm::all([this](const Algorithm &algo) { return true; })) {
         algo_perf[algo] = get_algo_perf(algo);
     }
     m_bench_algo = BenchAlgo::INVALID;
@@ -86,7 +86,7 @@ rapidjson::Value MoBenchmark::toJSON(rapidjson::Document &doc) const
 
 void MoBenchmark::read(const rapidjson::Value &value)
 {
-    for (Algorithm::Id algo = Algorithm::MIN; algo != Algorithm::MAX; algo = static_cast<Algorithm::Id>(algo + 1)) {
+    for (const Id algo : Algorithm::all([this](const Algorithm &algo) { return true; })) {
         algo_perf[algo] = 0.0f;
     }
     if (value.IsObject()) {
diff --git a/src/core/MoBenchmark.h b/src/core/MoBenchmark.h
index 47cb793b..12f9583e 100644
--- a/src/core/MoBenchmark.h
+++ b/src/core/MoBenchmark.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <set>
+#include <map>
 #include "net/interfaces/IJobResultListener.h"
 #include "base/crypto/Algorithm.h"
 #include "rapidjson/fwd.h"
@@ -95,7 +96,7 @@ class MoBenchmark : public IJobResultListener {
         void start(); // start benchmarks
 
         bool isNewBenchRun() const { return m_isNewBenchRun; }
-        double algo_perf[Algorithm::MAX];
+        std::map<Algorithm::Id, double> algo_perf;
 
         rapidjson::Value toJSON(rapidjson::Document &doc) const;
         void read(const rapidjson::Value &value);