diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-07-04 11:46:39 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-07-04 11:46:39 +0000 |
| commit | 8cb222f298e28c7eb7efbd5a1f44d07496bcb86b (patch) | |
| tree | f9d50b82b0be435770534305d4fa069c458b4a7b | |
| parent | 690cf7ab76f1a17973d2e920e295363a4cd40397 (diff) | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@262392 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/variant | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2c5e1ac66156..6f70d1cfaef6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,11 @@ 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> * include/std/variant (__gen_vtable_impl::__visit_invoke): Qualify diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 07b1e01359b1..a8b85a69f62c 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 |