aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2018-05-29 18:21:31 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2018-05-29 18:21:31 +0100
commit5baa6f8ebde0cc93ffe0921f572431edf3f85796 (patch)
tree354cf6146e3e7a63c68e2bdfb47d2ab1452d0827
parent69ce0c8c77e177c138e59d11434676f81425999c (diff)
downloadgcc-5baa6f8ebde0cc93ffe0921f572431edf3f85796.zip
gcc-5baa6f8ebde0cc93ffe0921f572431edf3f85796.tar.gz
gcc-5baa6f8ebde0cc93ffe0921f572431edf3f85796.tar.bz2
Qualify another call in <variant>
* include/std/variant (__erased_dtor): Qualify call to __get. From-SVN: r260900
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/std/variant2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3068a08..762de9a 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 c021240..63eafdd 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