summaryrefslogtreecommitdiff
path: root/src/core/managed/Manager.hpp
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2014-12-17 02:37:03 +0100
committerAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2014-12-17 02:37:03 +0100
commit540689657f4b080b1c1b49d6e654d9761b16e67b (patch)
tree071dbf12fa2b4b73d927443b696f2bafe46cd99c /src/core/managed/Manager.hpp
parent076e67fcd2cfd5a5ff9dd28b4ac0e6e5e8cd22c2 (diff)
made deletion order in Manager class (more) deterministic
Diffstat (limited to 'src/core/managed/Manager.hpp')
-rw-r--r--src/core/managed/Manager.hpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/managed/Manager.hpp b/src/core/managed/Manager.hpp
index ae0d130..303e591 100644
--- a/src/core/managed/Manager.hpp
+++ b/src/core/managed/Manager.hpp
@@ -156,6 +156,11 @@ private:
std::unordered_set<Managed *> deleted;
/**
+ * Vector containing the objects marked for deletion in an ordered fashion.
+ */
+ std::vector<Managed *> orderedDeleted;
+
+ /**
* Map storing the data attached to managed objects.
*/
std::unordered_map<Managed *, std::map<std::string, Managed *>> store;
@@ -163,7 +168,7 @@ private:
/**
* Map for storing the tagged memory regions.
*/
- std::map<uintptr_t, std::pair<uintptr_t, void*>> tags;
+ std::map<uintptr_t, std::pair<uintptr_t, void *>> tags;
/**
* Recursion depth while performing deletion. This variable is needed