From e4a5135fe3cfc77a2f7ea8d2fc55a346ed711789 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 15 May 2018 13:06:57 +0100 Subject: [PATCH] Qualify std::__invoke in to prevent ADL * include/std/variant (__gen_vtable_impl::__visit_invoke): Qualify __invoke to prevent ADL. From-SVN: r260254 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/variant | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 46d43d7ace0..22bcc0ffe1b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2018-05-15 Jonathan Wakely + + * include/std/variant (__gen_vtable_impl::__visit_invoke): Qualify + __invoke to prevent ADL. + 2018-05-14 Jonathan Wakely PR libstdc++/81256 diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 40b3b566938..c0212404bb2 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 -- 2.30.2