aboutsummaryrefslogtreecommitdiffstats
path: root/src/util/Manual.hxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-26 14:26:31 +0100
committerMax Kellermann <max@duempel.org>2014-12-26 14:28:52 +0100
commit940cab8620428f21e6d0c9f4b11893b1f44ce610 (patch)
tree9b4771f1fce4e0e95f1507f021aa7587b7ba366d /src/util/Manual.hxx
parent5b84c99d793bf9b78cf28b462593775c32a3ce83 (diff)
parent665031467a55a32be306191514ac81f73ac41de7 (diff)
downloadmpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.gz
mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.xz
mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.zip
Merge branch 'v0.18.x' into v0.19.x
Diffstat (limited to 'src/util/Manual.hxx')
-rw-r--r--src/util/Manual.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/Manual.hxx b/src/util/Manual.hxx
index baab0a555..75cffac06 100644
--- a/src/util/Manual.hxx
+++ b/src/util/Manual.hxx
@@ -35,7 +35,7 @@
#include <new>
#include <utility>
-#if !defined(__clang__) && __GNUC__ && !GCC_CHECK_VERSION(4,8)
+#if GCC_OLDER_THAN(4,8)
#include <type_traits>
#endif
@@ -54,7 +54,7 @@
*/
template<class T>
class Manual {
-#if !defined(__clang__) && __GNUC__ && !GCC_CHECK_VERSION(4,8)
+#if GCC_OLDER_THAN(4,8)
/* no alignas() on gcc < 4.8: apply worst-case fallback */
__attribute__((aligned(8)))
#else