aboutsummaryrefslogtreecommitdiffstats
path: root/src/db
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-11-28 19:09:21 +0100
committerMax Kellermann <max@duempel.org>2014-11-28 19:09:56 +0100
commitd93172bee81ce18cd3ea4675907d204502d7ff49 (patch)
treefd138b52de46d524843d046c06fd05b1f10f0c2d /src/db
parent25429af1227469e1b8d1c43d5da8d9d1b109fe8c (diff)
downloadmpd-d93172bee81ce18cd3ea4675907d204502d7ff49.tar.gz
mpd-d93172bee81ce18cd3ea4675907d204502d7ff49.tar.xz
mpd-d93172bee81ce18cd3ea4675907d204502d7ff49.zip
Compiler.h: add macro CLANG_OR_GCC_VERSION()
Diffstat (limited to 'src/db')
-rw-r--r--src/db/Helpers.cxx4
-rw-r--r--src/db/plugins/upnp/UpnpDatabasePlugin.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/db/Helpers.cxx b/src/db/Helpers.cxx
index add4bb98e..27bfb7c01 100644
--- a/src/db/Helpers.cxx
+++ b/src/db/Helpers.cxx
@@ -46,7 +46,7 @@ StatsVisitTag(DatabaseStats &stats, StringSet &artists, StringSet &albums,
for (const auto &item : tag) {
switch (item.type) {
case TAG_ARTIST:
-#if defined(__clang__) || GCC_CHECK_VERSION(4,8)
+#if CLANG_OR_GCC_VERSION(4,8)
artists.emplace(item.value);
#else
artists.insert(item.value);
@@ -54,7 +54,7 @@ StatsVisitTag(DatabaseStats &stats, StringSet &artists, StringSet &albums,
break;
case TAG_ALBUM:
-#if defined(__clang__) || GCC_CHECK_VERSION(4,8)
+#if CLANG_OR_GCC_VERSION(4,8)
albums.emplace(item.value);
#else
albums.insert(item.value);
diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
index f038a668c..8d7f1bda8 100644
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@@ -747,7 +747,7 @@ UpnpDatabase::VisitUniqueTags(const DatabaseSelection &selection,
const char *value = dirent.tag.GetValue(tag);
if (value != nullptr) {
-#if defined(__clang__) || GCC_CHECK_VERSION(4,8)
+#if CLANG_OR_GCC_VERSION(4,8)
values.emplace(value);
#else
values.insert(value);