From 08233f0d6eae9d780d787e8c61cbc051bfe6af43 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 13 Sep 2018 14:47:14 +0100 Subject: [PATCH] Limit workaround for Clang bug to __clang_major__ <= 7 The bug https://bugs.llvm.org/show_bug.cgi?id=33222 is now fixed on Clang trunk, so the workaround won't be needed for Clang 8.0 and later. * include/std/variant (variant) [__clang__]: Limit workaround to Clang 7 and older. From-SVN: r264271 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/variant | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b23dfe47d19..6e4fffc343f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-09-13 Jonathan Wakely + + * include/std/variant (variant) [__clang__]: Limit workaround to + Clang 7 and older. + 2018-09-11 Jonathan Wakely PR libstdc++/87278 diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 2d86a704c63..5a77e9e2d84 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1296,7 +1296,7 @@ namespace __variant #undef _VARIANT_RELATION_FUNCTION_TEMPLATE -#ifdef __clang__ +#if defined(__clang__) && __clang_major__ <= 7 public: using _Base::_M_u; // See https://bugs.llvm.org/show_bug.cgi?id=31852 private: