From 920ed5ca3d073e5883024cb2886ce49c6919e595 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 11 Jun 2024 18:52:09 -0400
Subject: [PATCH] Internals: Avoid unordered_map/set. No functional change
 intended.

---
 include/verilated_trace.h | 6 +++---
 include/verilated_types.h | 3 +--
 include/verilated_vpi.cpp | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/verilated_trace.h b/include/verilated_trace.h
index 36ba80b4b..dd47ad81b 100644
--- a/include/verilated_trace.h
+++ b/include/verilated_trace.h
@@ -31,8 +31,8 @@
 #include <memory>
 #include <string>
 #include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
+#include <map>
+#include <set>
 #include <vector>
 
 #include <deque>
@@ -295,7 +295,7 @@ private:
     uint64_t m_timeLastDump = 0;  // Last time we did a dump
     bool m_didSomeDump = false;  // Did at least one dump (i.e.: m_timeLastDump is valid)
     VerilatedContext* m_contextp = nullptr;  // The context used by the traced models
-    std::unordered_set<const VerilatedModel*> m_models;  // The collection of models being traced
+    std::set<const VerilatedModel*> m_models;  // The collection of models being traced
 
     void addCallbackRecord(std::vector<CallbackRecord>& cbVec, CallbackRecord&& cbRec)
         VL_MT_SAFE_EXCLUDES(m_mutex);
diff --git a/include/verilated_types.h b/include/verilated_types.h
index 32127ac0c..4affc6e4b 100644
--- a/include/verilated_types.h
+++ b/include/verilated_types.h
@@ -36,7 +36,6 @@
 #include <memory>
 #include <set>
 #include <string>
-#include <unordered_set>
 #include <utility>
 
 //=========================================================================
@@ -1402,7 +1401,7 @@ public:
     VlQueue<T_Key> unique_index(Func with_func) const {
         VlQueue<T_Key> out;
         IData index = 0;
-        std::unordered_set<T_Value> saw;
+        std::set<T_Value> saw;
         for (const auto& i : m_storage) {
             const auto i_mapped = with_func(index, i);
             auto it = saw.find(i_mapped);
diff --git a/include/verilated_vpi.cpp b/include/verilated_vpi.cpp
index 59e0e3925..b5d5928ed 100644
--- a/include/verilated_vpi.cpp
+++ b/include/verilated_vpi.cpp
@@ -39,7 +39,6 @@
 #include <map>
 #include <set>
 #include <string>
-#include <unordered_set>
 #include <utility>
 #include <vector>
 
@@ -922,7 +921,7 @@ public:
         assertOneCheck();
         VpioCbList& cbObjList = s().m_cbCurrentLists[cbValueChange];
         bool called = false;
-        std::unordered_set<VerilatedVpioVar*> update;  // set of objects to update after callbacks
+        std::set<VerilatedVpioVar*> update;  // set of objects to update after callbacks
         if (cbObjList.empty()) return called;
         const auto last = std::prev(cbObjList.end());  // prevent looping over newly added elements
         for (auto it = cbObjList.begin(); true;) {