From 1292af476869e60fdd722168589a391b8411a2f8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 8 Feb 2017 10:21:35 +0100 Subject: [PATCH] Revert "DetachedSong: remove explicitly-defaulted copy/move constructors" This reverts commit 67b7d46432dd66cd94571489d231a4795ce4da39. Turns out I was wrong, and mentioning these does make a difference: the implicit move constructor is not defined in the presence of a user-declared destructor. --- src/DetachedSong.hxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/DetachedSong.hxx b/src/DetachedSong.hxx index be3b9355d..c55638e5b 100644 --- a/src/DetachedSong.hxx +++ b/src/DetachedSong.hxx @@ -100,6 +100,11 @@ public: ~DetachedSong(); + /* these are declared because the user-defined destructor + above prevents them from being generated implicitly */ + explicit DetachedSong(const DetachedSong &) = default; + DetachedSong(DetachedSong &&) = default; + gcc_pure const char *GetURI() const { return uri.c_str();