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/util | |
| 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 '')
| -rw-r--r-- | src/util/Cast.hxx | 4 | ||||
| -rw-r--r-- | src/util/Manual.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/util/Cast.hxx b/src/util/Cast.hxx index 887137da4..647171970 100644 --- a/src/util/Cast.hxx +++ b/src/util/Cast.hxx @@ -84,7 +84,7 @@ ContainerAttributeOffset(const A C::*p) * Cast the given pointer to a struct member to its parent structure. */ template<class C, class A> -#if defined(__clang__) || GCC_CHECK_VERSION(4,7) +#if CLANG_OR_GCC_VERSION(4,7) constexpr #endif static inline C & @@ -97,7 +97,7 @@ ContainerCast(A &a, A C::*member) * Cast the given pointer to a struct member to its parent structure. */ template<class C, class A> -#if defined(__clang__) || GCC_CHECK_VERSION(4,7) +#if CLANG_OR_GCC_VERSION(4,7) constexpr #endif static inline const C & diff --git a/src/util/Manual.hxx b/src/util/Manual.hxx index fa4b00615..153851aba 100644 --- a/src/util/Manual.hxx +++ b/src/util/Manual.hxx @@ -41,7 +41,7 @@ #include <assert.h> -#if defined(__clang__) || GCC_CHECK_VERSION(4,7) +#if CLANG_OR_GCC_VERSION(4,7) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif @@ -114,7 +114,7 @@ public: } }; -#if defined(__clang__) || GCC_CHECK_VERSION(4,7) +#if CLANG_OR_GCC_VERSION(4,7) #pragma GCC diagnostic pop #endif |