From 37dd4cb99bf44e57cca0272ed6de8c8156f35efa Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 7 May 2021 09:09:27 +0200 Subject: loplugin:noexcept (macOS) Change-Id: I7eede75da6b81777661e0e5b76c8877e122f941b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115224 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx | 10 +++++----- bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx index ceed901f9e11..584197c1a226 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx @@ -95,7 +95,7 @@ enum x86_64_reg_class static enum x86_64_reg_class merge_classes (enum x86_64_reg_class class1, enum x86_64_reg_class class2) - throw () + noexcept { /* Rule #1: If both classes are equal, this is the resulting class. */ if (class1 == class2) @@ -138,7 +138,7 @@ merge_classes (enum x86_64_reg_class class1, enum x86_64_reg_class class2) See the x86-64 PS ABI for details. */ static int -classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int byteOffset ) throw () +classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int byteOffset ) noexcept { switch ( pTypeRef->eTypeClass ) { @@ -257,7 +257,7 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c /* Examine the argument and return set number of register required in each class. Return 0 iff parameter should be passed in memory. */ -bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) throw () +bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) noexcept { enum x86_64_reg_class classes[MAX_CLASSES]; int n; @@ -296,14 +296,14 @@ bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool return true; } -bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef ) throw () +bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef ) noexcept { int g, s; return !examine_argument( pTypeRef, true, g, s ); } -void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64 *pGPR, const double *pSSE, void *pStruct ) throw () +void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64 *pGPR, const double *pSSE, void *pStruct ) noexcept { enum x86_64_reg_class classes[MAX_CLASSES]; int n; diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx index e8f8785c4a60..20bfc7286b4d 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx @@ -41,7 +41,7 @@ const sal_uInt32 MAX_SSE_REGS = 8; Return false iff parameter should be passed in memory. */ -bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) throw (); +bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE ) noexcept; /** Does function that returns this type use a hidden parameter, or registers? @@ -49,9 +49,9 @@ bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInRetur pointer to a structure allocated by the caller), or in registers (rax, rdx for the integers, xmm0, xmm1 for the floating point numbers). */ -bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef ) throw (); +bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef ) noexcept; -void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64* pGPR, const double* pSSE, void *pStruct ) throw (); +void fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64* pGPR, const double* pSSE, void *pStruct ) noexcept; } // namespace x86_64 diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx index deada0c17ac3..6b09d99a56c1 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx @@ -142,7 +142,7 @@ struct __cxa_eh_globals } -extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () throw(); +extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals () noexcept; namespace CPPU_CURRENT_NAMESPACE { -- cgit