summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2018-01-21 11:28:18 +0100
committerMax Kellermann <max@musicpd.org>2018-01-21 11:35:28 +0100
commit45748a2bb0740d28928da1c96b7da411d8cfb1dc (patch)
tree5bf1cddf94bb31cd53239912f693dfd4d8d96137 /src
parent9b13d862c1f91b89036dea600a0f97261fde0c62 (diff)
playlist/Song: add "noexcept"
Diffstat (limited to 'src')
-rw-r--r--src/playlist/PlaylistSong.cxx6
-rw-r--r--src/playlist/PlaylistSong.hxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/playlist/PlaylistSong.cxx b/src/playlist/PlaylistSong.cxx
index f3568500c..788d77c87 100644
--- a/src/playlist/PlaylistSong.cxx
+++ b/src/playlist/PlaylistSong.cxx
@@ -29,7 +29,7 @@
#include <string.h>
static void
-merge_song_metadata(DetachedSong &add, const DetachedSong &base)
+merge_song_metadata(DetachedSong &add, const DetachedSong &base) noexcept
{
if (base.GetTag().IsDefined()) {
TagBuilder builder(add.GetTag());
@@ -41,7 +41,7 @@ merge_song_metadata(DetachedSong &add, const DetachedSong &base)
}
static bool
-playlist_check_load_song(DetachedSong &song, const SongLoader &loader)
+playlist_check_load_song(DetachedSong &song, const SongLoader &loader) noexcept
try {
DetachedSong tmp = loader.LoadSong(song.GetURI());
@@ -57,7 +57,7 @@ try {
bool
playlist_check_translate_song(DetachedSong &song, const char *base_uri,
- const SongLoader &loader)
+ const SongLoader &loader) noexcept
{
if (base_uri != nullptr && strcmp(base_uri, ".") == 0)
/* PathTraitsUTF8::GetParent() returns "." when there
diff --git a/src/playlist/PlaylistSong.hxx b/src/playlist/PlaylistSong.hxx
index d9299da40..f72635b00 100644
--- a/src/playlist/PlaylistSong.hxx
+++ b/src/playlist/PlaylistSong.hxx
@@ -31,6 +31,6 @@ class DetachedSong;
*/
bool
playlist_check_translate_song(DetachedSong &song, const char *base_uri,
- const SongLoader &loader);
+ const SongLoader &loader) noexcept;
#endif