From d93172bee81ce18cd3ea4675907d204502d7ff49 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 28 Nov 2014 19:09:21 +0100
Subject: Compiler.h: add macro CLANG_OR_GCC_VERSION()

---
 src/tag/Set.cxx     | 2 +-
 src/tag/TagPool.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/tag')

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 *
-- 
cgit v1.2.3