summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-02-07 00:15:41 +0100
committerAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-02-07 00:15:41 +0100
commite1e816243dc4ada4ea8c538265bb37aaad92ceb0 (patch)
treea5ae3afd8bf4bf0250424c239e45938f068aef8e /src
parentc31f79dd4f9e235f9d37ac375c96e032f53ae7c3 (diff)
Changes in the comments, reenabled assertion
Diffstat (limited to 'src')
-rw-r--r--src/core/managed/Manager.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/managed/Manager.cpp b/src/core/managed/Manager.cpp
index 4a5e904..5f118b2 100644
--- a/src/core/managed/Manager.cpp
+++ b/src/core/managed/Manager.cpp
@@ -124,12 +124,11 @@ Manager::~Manager()
// Perform a final sweep
sweep();
- // All objects should have been deleted! TODO: Andreas will have a look.
-// assert(objects.empty());
+ // All objects should have been deleted!
+ assert(objects.empty());
// Free all objects managed by the Managed manager (we'll get here if
- // assertions
- // are disabled)
+ // assertions are disabled)
if (!objects.empty()) {
ScopedIncrement incr{deletionRecursionDepth};
for (auto &e : objects) {
@@ -214,8 +213,7 @@ void Manager::deleteRef(Managed *tar, Managed *src, bool all)
deleteObject(tar, dTar);
} else if (dTar->rootRefCount == 0) {
// Insert the Managed into the list of objects to be inspected by
- // garbage
- // collection
+ // garbage collection
marked.insert(tar);
}
}