Merge branch 'v0.18.x'

2014-01-20 09:05:36 +01:00
parent 64465c1318 ab9c9068d4
commit 2f51285349
12 changed files with 56 additions and 55 deletions
--- a/test/test_queue_priority.cxx
+++ b/test/test_queue_priority.cxx
@@ -12,7 +12,7 @@ Tag::Tag(const Tag &) {}
 void Tag::Clear() {}

 static void
-check_descending_priority(const struct queue *queue,
+check_descending_priority(const Queue *queue,
 			  unsigned start_order)
 {
 	assert(start_order < queue->GetLength());
@@ -58,7 +58,7 @@ QueuePriorityTest::TestPriority()
 		DetachedSong("f.ogg"),
 	};

-	struct queue queue(32);
+	Queue queue(32);

 	for (unsigned i = 0; i < ARRAY_SIZE(songs); ++i)
 		queue.Append(DetachedSong(songs[i]), 0);