From 0c1721144e372bd7b6c889811b3f9ab9382384e2 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 4 Mar 2018 15:32:42 +0100 Subject: [PATCH] Backport concurrent queue's fixes. 420509b6678263f0fa6c0ffba87a15319238a1f2 --- client/concurrentqueue.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/concurrentqueue.h b/client/concurrentqueue.h index ba9eafec..074dc2f2 100644 --- a/client/concurrentqueue.h +++ b/client/concurrentqueue.h @@ -242,8 +242,8 @@ namespace details { : static_cast(-1); }; -#if defined(__GNUC__) && !defined( __clang__ ) - typedef ::max_align_t std_max_align_t; // GCC forgot to add it to std:: for a while +#if defined(__GLIBCXX__) + typedef ::max_align_t std_max_align_t; // libstdc++ forgot to add it to std:: for a while #else typedef std::max_align_t std_max_align_t; // Others (e.g. MSVC) insist it can *only* be accessed via std:: #endif