From 53a13e8bc6da1f7a795a8d585974d917ffcb600c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 23 Jan 2014 21:21:27 +0100 Subject: DetachedSong: un-inline the destructor Reduce bloat. --- Makefile.am | 3 +++ src/DetachedSong.cxx | 5 +++++ src/DetachedSong.hxx | 2 ++ 3 files changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am index eaed7cb0a..cc44fc505 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1235,6 +1235,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \ src/PlaylistVector.cxx src/PlaylistDatabase.cxx \ src/DatabaseLock.cxx src/DatabaseSave.cxx \ src/Song.cxx src/SongSave.cxx src/SongSort.cxx \ + src/DetachedSong.cxx \ src/TagSave.cxx \ src/SongFilter.cxx @@ -1329,6 +1330,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \ if HAVE_FLAC test_dump_playlist_SOURCES += \ src/ReplayGainInfo.cxx \ + src/DetachedSong.cxx \ src/decoder/FlacMetadata.cxx endif @@ -1645,6 +1647,7 @@ test_test_translate_song_LDADD = \ test_test_queue_priority_SOURCES = \ src/Queue.cxx \ + src/DetachedSong.cxx \ test/test_queue_priority.cxx test_test_queue_priority_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0 test_test_queue_priority_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations diff --git a/src/DetachedSong.cxx b/src/DetachedSong.cxx index 6a54bc8ad..8882d2863 100644 --- a/src/DetachedSong.cxx +++ b/src/DetachedSong.cxx @@ -30,6 +30,11 @@ DetachedSong::DetachedSong(const LightSong &other) mtime(other.mtime), start_ms(other.start_ms), end_ms(other.end_ms) {} +DetachedSong::~DetachedSong() +{ + /* this destructor exists here just so it won't get inlined */ +} + bool DetachedSong::IsRemote() const { diff --git a/src/DetachedSong.hxx b/src/DetachedSong.hxx index b2f5196ff..c01f32ea5 100644 --- a/src/DetachedSong.hxx +++ b/src/DetachedSong.hxx @@ -97,6 +97,8 @@ public: DetachedSong(DetachedSong &&) = default; + ~DetachedSong(); + gcc_pure const char *GetURI() const { return uri.c_str(); -- cgit v1.2.3