From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 4 Jul 2018 13:59:32 +0000 (+0100)
Subject: Qualify std::__invoke in <variant> to prevent ADL
X-Git-Tag: releases/gcc-7.4.0~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ade0ce8b51275c9051bb1b5e73a7e33b914f7f91;p=thirdparty%2Fgcc.git

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 657965c40391..4e7046f6cb4a 100644
--- 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 4b70dc04d112..9716dda90e7c 100644
--- 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