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

Timestamp:

Nov 9, 2024 12:38:48 AM (3 months ago)

Author:

vboxsync

Message:

Main/ObjectsTracker.h/cpp: Another build fix attempt - the extpack solaris VM doesn't know the C++11 for loop style. It also doesn't have std::map::at(). Kicked out the std::string variant of the map type, it just clutters up the code with unnecessary string copies. jiraref:VBP-1187

File:

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

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

@@ -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 0 /* The solaris VM seems to have trouble with this or something related to it. */
-typedef std::string ObjIdString_T;
-#else
-typedef com::Utf8Str ObjIdString_T;
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
@@ -171 +161 @@
     std::set<com::Utf8Str> m_trackedObjectIds;//Full list of valid + invalid objects
     std::set<com::Utf8Str> m_trackedInvalidObjectIds;//List of invalid objects only
-    std::map<ObjIdString_T, TrackedObjectData> m_trackedObjectsData;//Mapping Object Id -> Object Data
+    std::map<com::Utf8Str, TrackedObjectData> m_trackedObjectsData;//Mapping Object Id -> Object Data
 
     uint64_t m_Added;//Counter of the added objects