From 0145d9d51420a089e49c12d3b595d2d80ce38b76 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 2 Nov 2020 19:55:01 -0500 Subject: [PATCH] Fix C++14 deprecated random_shuffle. --- include/verilated_heavy.h | 4 ++-- src/V3SplitVar.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/verilated_heavy.h b/include/verilated_heavy.h index 9e23181a8..49acd61ce 100644 --- a/include/verilated_heavy.h +++ b/include/verilated_heavy.h @@ -247,8 +247,8 @@ public: } void reverse() { std::reverse(m_deque.begin(), m_deque.end()); } void shuffle() { - std::random_shuffle(m_deque.begin(), m_deque.end(), - [=](int) { return VL_RANDOM_I(32) % m_deque.size(); }); + std::shuffle(m_deque.begin(), m_deque.end(), + [=](int) { return VL_RANDOM_I(32) % m_deque.size(); }); } VlQueue unique() const { VlQueue out; diff --git a/src/V3SplitVar.cpp b/src/V3SplitVar.cpp index 0612174e4..9e1b4590d 100644 --- a/src/V3SplitVar.cpp +++ b/src/V3SplitVar.cpp @@ -1211,10 +1211,9 @@ public: , m_numSplit{0} { // If you want ignore refs and walk the tne entire AST, // just call iterateChildren(m_modp) and split() for each module - for (SplitVarRefsMap::iterator it = refs.begin(), it_end = refs.end(); it != it_end; - ++it) { - m_modp = it->first; - it->second.visit(this); + for (auto& i : refs) { + m_modp = i.first; + i.second.visit(this); split(); m_modp = nullptr; } @@ -1246,7 +1245,7 @@ public: return reason; } VL_DEBUG_FUNC; // Declare debug() -}; + }; const char* SplitVarImpl::cannotSplitPackedVarReason(const AstVar* varp) { return SplitPackedVarVisitor::cannotSplitReason(varp, true);