Qualify std::__invoke in <variant> to prevent ADL

	* include/std/variant (__gen_vtable_impl::__visit_invoke): Qualify
	__invoke to prevent ADL.

From-SVN: r260254

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 46d43d7ace08f8f6dc8546a1c69e0a8ccee4e169..22bcc0ffe1b9c1130e146fef107a95055fa4b7f6 100644 (file)
--- 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 40b3b5669389dad6827256b9a9b8f62bef1ed82c..c0212404bb2fee87108e31cbc56dad255d243214 100644 (file)
--- 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