From efdda203f52b9b55ef9acc8ad668bbd0570a8de6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely <jwakely@redhat.com> Date: Thu, 26 Sep 2024 12:12:13 +0100 Subject: [PATCH] libstdc++: Remove noexcept-specifier from MCF __cxa_guard_acquire [PR116857] This function definition should not be marked as non-throwing, because the declaration in <cxxabi.h> is potentially throwing. Also fix whitespace. libstdc++-v3/ChangeLog: PR libstdc++/116857 * libsupc++/guard.cc (__cxa_guard_acquire): Remove _GLIBCXX_NOTHROW to match declaration in <cxxabi.h>. --- libstdc++-v3/libsupc++/guard.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc index 364797817f72..707083e09d06 100644 --- a/libstdc++-v3/libsupc++/guard.cc +++ b/libstdc++-v3/libsupc++/guard.cc @@ -36,22 +36,22 @@ namespace __cxxabiv1 { extern "C" int -__cxa_guard_acquire (__guard* g) _GLIBCXX_NOTHROW - { - return __MCF_cxa_guard_acquire(g); - } +__cxa_guard_acquire (__guard* g) +{ + return __MCF_cxa_guard_acquire(g); +} extern "C" void __cxa_guard_release (__guard* g) _GLIBCXX_NOTHROW - { - __MCF_cxa_guard_release(g); - } +{ + __MCF_cxa_guard_release(g); +} extern "C" void __cxa_guard_abort (__guard* g) _GLIBCXX_NOTHROW - { - __MCF_cxa_guard_abort(g); - } +{ + __MCF_cxa_guard_abort(g); +} } // namespace __cxxabiv1 -- GitLab