This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 3a153990b62d686f4c3f231432750155c6acc41d
Author: Don Lewis <[email protected]>
AuthorDate: Sun Jun 8 02:01:15 2025 -0700

    Tweak our declaration for __cxa_allocate_exception()
    
    Tweak our declaration for __cxa_allocate_exception() so that it matches
    the one that sometimes shows up in /usr/include/c++/v1/cxxabi.h.  Clang
    now treats the subtle differences as an error.
    
    (cherry picked from commit 2eea618918c0a834d288fbf460788a1c08389478)
    (cherry picked from commit 76cc68e7cb336cf6cd76c4de85e66ba9281a11cb)
---
 main/bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx     | 2 +-
 main/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx   | 2 +-
 main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx | 2 +-
 main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx 
b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx
index df4e6dc400..f309164e90 100644
--- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/share.hxx
@@ -61,7 +61,7 @@ namespace CPPU_CURRENT_NAMESPACE
     };    
 
     extern "C" void *__cxa_allocate_exception(
-        std::size_t thrown_size ) throw();
+        size_t thrown_size );
     extern "C" void __cxa_throw (
         void *thrown_exception, std::type_info *tinfo, 
         void (*dest) (void *) ) __attribute__((noreturn));
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx 
b/main/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx
index d15538edca..05d1c83f2a 100644
--- a/main/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_intel/share.hxx
@@ -62,7 +62,7 @@ struct __cxa_exception
 #endif /* __GLIBCXX__ */
 
 extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
+    size_t thrown_size );
 extern "C" void __cxa_throw (
     void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) 
__attribute__((noreturn));
 
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx 
b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx
index 0f0e577a76..d56a5dae49 100644
--- a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/share.hxx
@@ -65,7 +65,7 @@ struct __cxa_exception
 };    
 
 extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
+    size_t thrown_size );
 extern "C" void __cxa_throw (
     void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) 
__attribute__((noreturn));
 
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx 
b/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx
index d15538edca..05d1c83f2a 100644
--- a/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx
@@ -62,7 +62,7 @@ struct __cxa_exception
 #endif /* __GLIBCXX__ */
 
 extern "C" void *__cxa_allocate_exception(
-    std::size_t thrown_size ) throw();
+    size_t thrown_size );
 extern "C" void __cxa_throw (
     void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) 
__attribute__((noreturn));
 

Reply via email to