From 83488848e1091024a0a307b1539c1a85762ee1f1 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Jan 2013 02:12:34 +0100 Subject: [PATCH] Directory: initialise in default constructor --- src/Directory.cxx | 9 +++++++++ src/Directory.hxx | 2 +- test/DumpPlaylist.cxx | 1 + test/TestQueuePriority.cxx | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Directory.cxx b/src/Directory.cxx index b67ad3de8..dec772c01 100644 --- a/src/Directory.cxx +++ b/src/Directory.cxx @@ -51,6 +51,15 @@ Directory::Allocate(const char *path) return directory; } +Directory::Directory() +{ + INIT_LIST_HEAD(&children); + INIT_LIST_HEAD(&songs); + INIT_LIST_HEAD(&playlists); + + path[0] = 0; +} + Directory::Directory(const char *_path) { INIT_LIST_HEAD(&children); diff --git a/src/Directory.hxx b/src/Directory.hxx index 3b2c6b1a3..ab23a6922 100644 --- a/src/Directory.hxx +++ b/src/Directory.hxx @@ -100,7 +100,7 @@ public: /** * Default constructor, needed for #detached_root. */ - Directory() = default; + Directory(); ~Directory(); /** diff --git a/test/DumpPlaylist.cxx b/test/DumpPlaylist.cxx index 612f54827..427052b6c 100644 --- a/test/DumpPlaylist.cxx +++ b/test/DumpPlaylist.cxx @@ -38,6 +38,7 @@ extern "C" { #include #include +Directory::Directory() {} Directory::~Directory() {} static void diff --git a/test/TestQueuePriority.cxx b/test/TestQueuePriority.cxx index 01f39a006..6d994176f 100644 --- a/test/TestQueuePriority.cxx +++ b/test/TestQueuePriority.cxx @@ -7,6 +7,7 @@ extern "C" { Directory detached_root; +Directory::Directory() {} Directory::~Directory() {} struct song *