aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-02 22:52:08 +0100
committerMax Kellermann <max@duempel.org>2013-01-02 22:52:08 +0100
commit0c245bc2712f5d38507b8d421cdc0a7e002a3398 (patch)
treee69818281103ba2602613d5820fef62d58d296a9 /test
parentd65ad1bf151383722802d4bb13b12a33b97480e4 (diff)
Directory: make the header C++ only
Diffstat (limited to 'test')
-rw-r--r--test/DumpDatabase.cxx2
-rw-r--r--test/TestQueuePriority.cxx (renamed from test/test_queue_priority.c)11
2 files changed, 5 insertions, 8 deletions
diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx
index fc42ba14..3a4e980b 100644
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@@ -21,7 +21,7 @@
#include "DatabaseRegistry.hxx"
#include "DatabasePlugin.hxx"
#include "DatabaseSelection.hxx"
-#include "directory.h"
+#include "Directory.hxx"
#include "song.h"
#include "PlaylistVector.hxx"
diff --git a/test/test_queue_priority.c b/test/TestQueuePriority.cxx
index b4a7366e..a046df52 100644
--- a/test/test_queue_priority.c
+++ b/test/TestQueuePriority.cxx
@@ -1,19 +1,16 @@
#include "config.h"
+extern "C" {
#include "queue.h"
+}
#include "song.h"
-#include "directory.h"
+#include "Directory.hxx"
struct directory detached_root;
struct song *
song_dup_detached(const struct song *src)
{
- union {
- const struct song *in;
- struct song *out;
- } u = { .in = src };
-
- return u.out;
+ return const_cast<song *>(src);
}
void