From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 15 May 2018 12:06:57 +0000 (+0100)
Subject: Qualify std::__invoke in <variant> to prevent ADL
X-Git-Tag: upstream/12.2.0~31849
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4a5135fe3cfc77a2f7ea8d2fc55a346ed711789;p=platform%2Fupstream%2Fgcc.git

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 46d43d7..22bcc0f 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 40b3b56..c021240 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