From e1e816243dc4ada4ea8c538265bb37aaad92ceb0 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Sat, 7 Feb 2015 00:15:41 +0100 Subject: Changes in the comments, reenabled assertion --- src/core/managed/Manager.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/core') 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); } } -- cgit v1.2.3