Changeset 106900 in vbox for trunk/src/VBox/Main/include/ObjectsTracker.h

Timestamp:

Nov 8, 2024 10:45:15 PM (3 months ago)

Author:

vboxsync

Message:

Main/ObjectsTracker.h/cpp: Build fix - the extpack solaris VM doesn't have std::unordered_map, so we have to use std::map or something else. Fixed atomic fFinish handling. jiraref:VBP-1187

File:

• trunk/src/VBox/Main/include/ObjectsTracker.h (modified) (3 diffs)

trunk/src/VBox/Main/include/ObjectsTracker.h

@@ -33 +33 @@
 
 #include <set>
-#include <unordered_map>
+#include <map>
 #include <vector>
 #include <string>
@@ -150 +150 @@
 };
 
+/** The string representation for object IDs in the internal map.
+ * @todo r=bird: Why are you using std::string here? We use 
+ *       should use com::Utf8Str where possible. In this case, though, it's a
+ *       com::Guid which would have much more efficient storage compared
+ *       to both the string variants... */
+#if 1
+typedef std::string ObjIdString_T;
+#else
+typedef com::Utf8Str ObjIdString_T;
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 // TrackedObjectsCollector
-/////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////// 
 class TrackedObjectsCollector
 {
@@ -160 +171 @@
     std::set<com::Utf8Str> m_trackedObjectIds;//Full list of valid + invalid objects
     std::set<com::Utf8Str> m_trackedInvalidObjectIds;//List of invalid objects only
-    std::unordered_map<std::string, TrackedObjectData> m_trackedObjectsData;//Mapping Object Id -> Object Data
+    std::map<ObjIdString_T, TrackedObjectData> m_trackedObjectsData;//Mapping Object Id -> Object Data
 
     uint64_t m_Added;//Counter of the added objects