From 228cd7c3ad6a64c5c3fa72dad40082cd643a31cd Mon Sep 17 00:00:00 2001 From: redi Date: Tue, 29 May 2018 17:21:31 +0000 Subject: [PATCH] Qualify another call in * include/std/variant (__erased_dtor): Qualify call to __get. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@260900 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/std/variant | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * include/std/variant (__erased_dtor): Qualify call to __get. + 2018-05-27 François Dumont * 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 void __erased_dtor(_Variant&& __v) - { std::_Destroy(std::__addressof(__get<_Np>(__v))); } + { std::_Destroy(std::__addressof(__variant::__get<_Np>(__v))); } template void -- 2.11.4.GIT