| Message ID | 20180503185522.1734-1-duarte@scylladb.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1] PR libstdc++/84769 qualify std::get to avoid ADL | expand |
On 03/05/18 20:55 +0200, Duarte Nunes wrote: >PR libstdc++/84769 >* include/std/variant (visit<_Visitor, _Variants...>): >Qualify call to std::get<_Np, _Types...>. Thanks for the patch, I was already testing the same change and just committed the attached patch to trunk. Backports for other branches to follow shortly. >--- > ChangeLog | 6 ++++++ > libstdc++-v3/include/std/variant | 2 +- > 2 files changed, 7 insertions(+), 1 deletion(-) > >diff --git a/ChangeLog b/ChangeLog >index ec03a5bcdad..bf2c58aee2b 100644 >--- a/ChangeLog >+++ b/ChangeLog N.B. libstdc++ has its own ChangeLog file, in libstdc++-v3/ChangeLog >@@ -1,3 +1,9 @@ >+2018-05-03 Duarte Nunes <duarte@scylladb.com> >+ >+PR libstdc++/84769 >+ * include/std/variant (visit<_Visitor, _Variants...>): >+ Qualify call to std::get<_Np, _Types...>. >+ > 2018-05-01 Francois H. Theron <francois.theron@netronome.com> > > * configure.ac: Added "nfp" target. >diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant >index f64c037a514..40b3b566938 100644 >--- a/libstdc++-v3/include/std/variant >+++ b/libstdc++-v3/include/std/variant >@@ -1389,7 +1389,7 @@ namespace __variant > > using _Result_type = > decltype(std::forward<_Visitor>(__visitor)( >- get<0>(std::forward<_Variants>(__variants))...)); >+ std::get<0>(std::forward<_Variants>(__variants))...)); > > constexpr auto& __vtable = __detail::__variant::__gen_vtable< > _Result_type, _Visitor&&, _Variants&&...>::_S_vtable; >-- >2.17.0 > commit e5fb1ad534a0a7323008c65838a6b131cd80e6d4 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu May 3 19:36:25 2018 +0100 PR libstdc++/84769 qualify call to std::get<0> PR libstdc++/84769 * include/std/variant (visit): Qualify std::get call. diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index f64c037a514..40b3b566938 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1389,7 +1389,7 @@ namespace __variant using _Result_type = decltype(std::forward<_Visitor>(__visitor)( - get<0>(std::forward<_Variants>(__variants))...)); + std::get<0>(std::forward<_Variants>(__variants))...)); constexpr auto& __vtable = __detail::__variant::__gen_vtable< _Result_type, _Visitor&&, _Variants&&...>::_S_vtable;
diff --git a/ChangeLog b/ChangeLog index ec03a5bcdad..bf2c58aee2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-05-03 Duarte Nunes <duarte@scylladb.com> + +PR libstdc++/84769 + * include/std/variant (visit<_Visitor, _Variants...>): + Qualify call to std::get<_Np, _Types...>. + 2018-05-01 Francois H. Theron <francois.theron@netronome.com> * configure.ac: Added "nfp" target. diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index f64c037a514..40b3b566938 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1389,7 +1389,7 @@ namespace __variant using _Result_type = decltype(std::forward<_Visitor>(__visitor)( - get<0>(std::forward<_Variants>(__variants))...)); + std::get<0>(std::forward<_Variants>(__variants))...)); constexpr auto& __vtable = __detail::__variant::__gen_vtable< _Result_type, _Visitor&&, _Variants&&...>::_S_vtable;
PR libstdc++/84769 * include/std/variant (visit<_Visitor, _Variants...>): Qualify call to std::get<_Np, _Types...>. Signed-off-by: Duarte Nunes <duarte@scylladb.com> --- ChangeLog | 6 ++++++ libstdc++-v3/include/std/variant | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)