From 3ca0a39a357d9be9c85de4892ac02716f8af2ae8 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 10 Jun 2014 21:15:40 +0200
Subject: db/simple: use class boost::intrusive::list

Remove the C list_head library and use type-safe C++ instead.
---
 src/db/update/Editor.cxx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/db/update/Editor.cxx')

diff --git a/src/db/update/Editor.cxx b/src/db/update/Editor.cxx
index c3c1a23d6..4136ccdad 100644
--- a/src/db/update/Editor.cxx
+++ b/src/db/update/Editor.cxx
@@ -64,15 +64,14 @@ DatabaseEditor::LockDeleteSong(Directory &parent, Song *song)
 inline void
 DatabaseEditor::ClearDirectory(Directory &directory)
 {
-	Directory *child, *n;
-	directory_for_each_child_safe(child, n, directory)
-		DeleteDirectory(child);
-
-	Song *song, *ns;
-	directory_for_each_song_safe(song, ns, directory) {
-		assert(song->parent == &directory);
-		DeleteSong(directory, song);
-	}
+	directory.ForEachChildSafe([this](Directory &child){
+			DeleteDirectory(&child);
+		});
+
+	directory.ForEachSongSafe([this, &directory](Song &song){
+			assert(song.parent == &directory);
+			DeleteSong(directory, &song);
+		});
 }
 
 void
-- 
cgit v1.2.3