diff options
| author | Max Kellermann <max@duempel.org> | 2014-11-28 19:09:21 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-11-28 19:09:56 +0100 |
| commit | d93172bee81ce18cd3ea4675907d204502d7ff49 (patch) | |
| tree | fd138b52de46d524843d046c06fd05b1f10f0c2d /src/tag | |
| parent | 25429af1227469e1b8d1c43d5da8d9d1b109fe8c (diff) | |
| download | mpd-d93172bee81ce18cd3ea4675907d204502d7ff49.tar.gz mpd-d93172bee81ce18cd3ea4675907d204502d7ff49.tar.xz mpd-d93172bee81ce18cd3ea4675907d204502d7ff49.zip | |
Compiler.h: add macro CLANG_OR_GCC_VERSION()
Diffstat (limited to 'src/tag')
| -rw-r--r-- | src/tag/Set.cxx | 2 | ||||
| -rw-r--r-- | src/tag/TagPool.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tag/Set.cxx b/src/tag/Set.cxx index 6a55a450f..157060d0c 100644 --- a/src/tag/Set.cxx +++ b/src/tag/Set.cxx @@ -75,7 +75,7 @@ TagSet::InsertUnique(const Tag &src, TagType type, const char *value, else builder.AddItem(type, value); CopyTagMask(builder, src, group_mask); -#if defined(__clang__) || GCC_CHECK_VERSION(4,8) +#if CLANG_OR_GCC_VERSION(4,8) emplace(builder.Commit()); #else insert(builder.Commit()); diff --git a/src/tag/TagPool.cxx b/src/tag/TagPool.cxx index 29f605337..88211be1b 100644 --- a/src/tag/TagPool.cxx +++ b/src/tag/TagPool.cxx @@ -87,7 +87,7 @@ calc_hash(TagType type, const char *p) return hash ^ type; } -#if defined(__clang__) || GCC_CHECK_VERSION(4,7) +#if CLANG_OR_GCC_VERSION(4,7) constexpr #endif static inline TagPoolSlot * |