DetachedSong: don't declare empty destructor

An explicit destructor prevents usage of implicit move operators, even if it's empty. Therefore, declaring a defaulted destructor with GCC attribute "noinline" does what we want without preventing those implicit operators.

DetachedSong: don't declare empty destructor
332baa4f · Max Kellermann · 08879d2a · 332baa4f · 332baa4f
Commit 332baa4f authored Feb 08, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

DetachedSong.cxx src/DetachedSong.cxx +0 -5

DetachedSong.hxx src/DetachedSong.hxx +2 -1

No files found.
--- a/src/DetachedSong.cxx
+++ b/src/DetachedSong.cxx
@@ -31,11 +31,6 @@ DetachedSong::DetachedSong(const LightSong &other)
 	 start_time(other.start_time),
 	 end_time(other.end_time) {}

-DetachedSong::~DetachedSong()
-{
-	/* this destructor exists here just so it won't  inlined */
-}
-
 bool
 DetachedSong::IsRemote() const
 {

--- a/src/DetachedSong.hxx
+++ b/src/DetachedSong.hxx
@@ -98,7 +98,8 @@ public:
 	 */
 	explicit DetachedSong(const LightSong &other);

-	~DetachedSong();
+	gcc_noinline
+	~DetachedSong() = default;

 	/* these are declared because the user-defined destructor
 	   above prevents them from being generated implicitly */