[gem5-dev] Change in gem5/gem5[develop]: cpu-minor: Substitute calls to functions removed in c++-17

[Nikos Nikoleris (Gerrit) via gem5-dev]

Nikos Nikoleris has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/47799 )

Change subject: cpu-minor: Substitute calls to functions removed in c++-17
......................................................................

cpu-minor: Substitute calls to functions removed in c++-17

Change-Id: Ib15234b37e577afd7ff186f1ba7cc5896aea1430
Signed-off-by: Nikos Nikoleris <nikos.nikole...@arm.com>
---
M src/cpu/minor/cpu.hh
M src/cpu/minor/execute.cc
2 files changed, 10 insertions(+), 2 deletions(-)



diff --git a/src/cpu/minor/cpu.hh b/src/cpu/minor/cpu.hh
index 57b73b7..929048f 100644
--- a/src/cpu/minor/cpu.hh
+++ b/src/cpu/minor/cpu.hh
@@ -44,6 +44,8 @@
 #ifndef __CPU_MINOR_CPU_HH__
 #define __CPU_MINOR_CPU_HH__

+#include <random>
+
 #include "base/compiler.hh"
 #include "cpu/minor/activity.hh"
 #include "cpu/minor/stats.hh"
@@ -184,7 +186,11 @@
         for (ThreadID i = 0; i < numThreads; i++) {
             prio_list.push_back(i);
         }
-        std::random_shuffle(prio_list.begin(), prio_list.end());
+
+        std::random_device r;
+        std::shuffle(prio_list.begin(), prio_list.end(),
+                     std::default_random_engine(r()));
+
         return prio_list;
     }

diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index 793ed7e..81850cb 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -37,6 +37,8 @@

 #include "cpu/minor/execute.hh"

+#include <functional>
+
 #include "arch/locked_mem.hh"
 #include "cpu/minor/cpu.hh"
 #include "cpu/minor/exec_context.hh"
@@ -1685,7 +1687,7 @@
         stalled.str(), executeInfo[0].drainState, isInbetweenInsts(0));

     std::for_each(funcUnits.begin(), funcUnits.end(),
-        std::mem_fun(&FUPipeline::minorTrace));
+        std::mem_fn(&FUPipeline::minorTrace));

     executeInfo[0].inFlightInsts->minorTrace();
     executeInfo[0].inFUMemInsts->minorTrace();

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47799
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ib15234b37e577afd7ff186f1ba7cc5896aea1430
Gerrit-Change-Number: 47799
Gerrit-PatchSet: 1
Gerrit-Owner: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s