From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 29 May 2018 17:21:31 +0000 (+0100)
Subject: Qualify another call in <variant>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5baa6f8ebde0cc93ffe0921f572431edf3f85796;p=gcc.git

Qualify another call in <variant>

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

From-SVN: r260900
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3068a08b3ec..762de9a763d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-29  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/std/variant (__erased_dtor): Qualify call to __get.
+
 2018-05-27  François Dumont  <fdumont@gcc.gnu.org>
 
 	* include/bits/stl_tree.h (_Rb_tree_impl(_Node_allocator&&)): New.
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index c0212404bb2..63eafdd58e5 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -249,7 +249,7 @@ namespace __variant
   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