diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-05-15 12:06:57 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-05-15 12:06:57 +0000 |
| commit | 581da9d39d0cb47d4e11c9a50a5159fcd7633dce (patch) | |
| tree | 31f9271dc85e70a5a4e802471fc2b74f988e7b5f | |
| parent | 8ade4cdeb710851af02f76a42ed017302015abd3 (diff) | |
Qualify std::__invoke in <variant> to prevent ADL
* include/std/variant (__gen_vtable_impl::__visit_invoke): Qualify
__invoke to prevent ADL.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@260254 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/variant | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 46d43d7ace08..22bcc0ffe1b9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-05-15 Jonathan Wakely <jwakely@redhat.com> + + * include/std/variant (__gen_vtable_impl::__visit_invoke): Qualify + __invoke to prevent ADL. + 2018-05-14 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/81256 diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 40b3b5669389..c0212404bb2f 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -838,9 +838,8 @@ namespace __variant decltype(auto) static constexpr __visit_invoke(_Visitor&& __visitor, _Variants... __vars) { - return __invoke(std::forward<_Visitor>(__visitor), - std::get<__indices>( - std::forward<_Variants>(__vars))...); + return std::__invoke(std::forward<_Visitor>(__visitor), + std::get<__indices>(std::forward<_Variants>(__vars))...); } static constexpr auto |