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 4e7046f6cb4aaaf2383ed2a7032a8a2e02cf1654..e174d8d24d16688543d7aee9fb1da8d1fa274a5c 100644 (file)
--- 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 9716dda90e7cb00a5df95c7d69329faea4158f68..2efe62cfe7ca68e084cc2f71bed6410c475a8d18 100644 (file)
--- 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