On Fri, 7 Jun 2024 at 05:43, Alexandre Oliva <ol...@adacore.com> wrote: > > On May 31, 2024, Alexandre Oliva <ol...@adacore.com> wrote: > > >> I think we could drop this kluge entirely, clang 7 is old now, we > >> generally only support the most recent 3 or 4 clang versions. > > > Fine with me, but I'd do that in a separate later patch, so that this > > goes in, and if it gets backported, it will cover this change, rather > > than miss it. Though, as you say, it doesn't matter much either way. > > In response to a request in the review of the patch that introduced > _GLIBCXX_CLANG, this patch removes from std/variant an obsolete > workaround for clang 7-. > > Regstrapping on x86_64-linux-gnu. Ok to install?
OK for trunk, thanks. I've tested it with Clang 17.0.6 > > > for libstdc++-v3/ChangeLog > > * include/std/variant: Drop obsolete workaround. > --- > libstdc++-v3/include/std/variant | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/libstdc++-v3/include/std/variant > b/libstdc++-v3/include/std/variant > index 51aaa62085170..13ea1dd384965 100644 > --- a/libstdc++-v3/include/std/variant > +++ b/libstdc++-v3/include/std/variant > @@ -1758,11 +1758,6 @@ namespace __detail::__variant > }, __rhs); > } > > -#if defined(_GLIBCXX_CLANG) && __clang_major__ <= 7 > - public: > - using _Base::_M_u; // See https://bugs.llvm.org/show_bug.cgi?id=31852 > -#endif > - > private: > template<size_t _Np, typename _Vp> > friend constexpr decltype(auto) > > > -- > Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/ > Free Software Activist GNU Toolchain Engineer > More tolerance and less prejudice are key for inclusion and diversity > Excluding neuro-others for not behaving ""normal"" is *not* inclusive >
