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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@264271 138bc75d-0d04-0410-961f-82ee72b054a4
RockSolidW · Sep 13, 2018 · a9267d6 · a9267d6
1 parent 23ea555
commit a9267d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-13  Jonathan Wakely  <[email protected]>
+
+	* include/std/variant (variant) [__clang__]: Limit workaround to
+	Clang 7 and older.
+
 2018-09-11  Jonathan Wakely  <[email protected]>
 
 	PR libstdc++/87278

diff --git 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: