oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/DeleteDisposer: new utility class

Browse Source
This commit is contained in:
Max Kellermann
2015-10-19 15:57:00 +02:00
parent 62bfb1a273
commit 8d23706354
7 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/db/plugins/simple/Directory.cxx
View File

@@ -31,6 +31,7 @@
#include "lib/icu/Collate.hxx"
#include "fs/Traits.hxx"
#include "util/Alloc.hxx"
#include "util/DeleteDisposer.hxx"
#include "util/Error.hxx"
#include <assert.h>
@@ -51,7 +52,7 @@ Directory::~Directory()
delete mounted_database;
songs.clear_and_dispose(Song::Disposer());
children.clear_and_dispose(Disposer());
children.clear_and_dispose(DeleteDisposer());
}
void
@@ -61,7 +62,7 @@ Directory::Delete()
assert(parent != nullptr);
parent->children.erase_and_dispose(parent->children.iterator_to(*this),
Disposer());
DeleteDisposer());
}
const char *
@@ -110,7 +111,8 @@ Directory::PruneEmpty()
child->PruneEmpty();
if (child->IsEmpty())
child = children.erase_and_dispose(child, Disposer());
child = children.erase_and_dispose(child,
DeleteDisposer());
else
++child;
}