From f4f53ba83ac1e711f5e78cddc4f4063108327e81 Mon Sep 17 00:00:00 2001 From: redi Date: Fri, 10 May 2019 22:23:10 +0000 Subject: [PATCH] PR libstdc++/90397 fix std::variant friend declaration Clang diagnoses insert inconsistent noexcept-specifier on the friend declaration of __get. Add . PR libstdc++/90397 * include/std/variant (variant): Add noexcept to friend declaration. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@271083 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 3 +++ libstdc++-v3/include/std/variant | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d440be5e49d8..4ac03895bcae 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-05-10 Jonathan Wakely + PR libstdc++/90397 + * include/std/variant (variant): Add noexcept to friend declaration. + Backport from mainline 2019-04-26 Jonathan Wakely diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 8c7d7f37fe28..75fb0dc164ac 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1556,7 +1556,8 @@ namespace __variant #endif template - friend constexpr decltype(auto) __detail::__variant::__get(_Vp&& __v); + friend constexpr decltype(auto) + __detail::__variant::__get(_Vp&& __v) noexcept; template friend void* __detail::__variant::__get_storage(_Vp&& __v);