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

Backport from mainline
2018-05-15  Jonathan Wakely  <jwakely@redhat.com>

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

From-SVN: r262409

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 657965c403911a29450e2e1409b845feaa999095..4e7046f6cb4aaaf2383ed2a7032a8a2e02cf1654 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2018-07-04  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2018-05-15  Jonathan Wakely  <jwakely@redhat.com>
+
+       * include/std/variant (__gen_vtable_impl::__visit_invoke): Qualify
+       __invoke to prevent ADL.
+
        Backport from mainline
        2018-04-05  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index 4b70dc04d112f7282f490525f5194ee310295ae6..9716dda90e7cb00a5df95c7d69329faea4158f68 100644 (file)
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -684,9 +684,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       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