From 0c9b443272c5101a9132fe9a933d55e05e7f11b7 Mon Sep 17 00:00:00 2001 From: redi Date: Thu, 3 May 2018 18:58:04 +0000 Subject: [PATCH] PR libstdc++/84769 qualify call to std::get<0> PR libstdc++/84769 * include/std/variant (visit): Qualify std::get call. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@259902 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/std/variant | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c2a224da55b..823d284d1d4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2018-05-03 Jonathan Wakely + PR libstdc++/84769 + * include/std/variant (visit): Qualify std::get call. + PR libstdc++/85632 use uintmax_t for arithmetic * src/filesystem/ops.cc (experimental::filesystem::space): Perform arithmetic in result type. diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index f64c037a514..40b3b566938 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1389,7 +1389,7 @@ namespace __variant using _Result_type = decltype(std::forward<_Visitor>(__visitor)( - get<0>(std::forward<_Variants>(__variants))...)); + std::get<0>(std::forward<_Variants>(__variants))...)); constexpr auto& __vtable = __detail::__variant::__gen_vtable< _Result_type, _Visitor&&, _Variants&&...>::_S_vtable; -- 2.11.4.GIT