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

Qualify another call in <variant>

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

	* include/std/variant (__erased_dtor): Qualify call to __get.

From-SVN: r262410
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4e7046f6cb4a..e174d8d24d16 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2018-07-04  Jonathan Wakely  <jwakely@redhat.com>
 
+	Backport from mainline
+	2018-05-29  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/std/variant (__erased_dtor): Qualify call to __get.
+
 	Backport from mainline
 	2018-05-15  Jonathan Wakely  <jwakely@redhat.com>
 
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index 9716dda90e7c..2efe62cfe7ca 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -255,7 +255,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template<typename _Variant, size_t _Np>
     void
     __erased_dtor(_Variant&& __v)
-    { std::_Destroy(std::__addressof(__get<_Np>(__v))); }
+    { std::_Destroy(std::__addressof(__variant::__get<_Np>(__v))); }
 
   template<typename _Lhs, typename _Rhs>
     void