diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-11-03 00:37:29 +0500 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-11-02 22:16:06 +0100 |
| commit | ad686b26cec93653b67642f79bace16df0fd1348 (patch) | |
| tree | af60fa5985659deb5a5c15bae45099b84f466e98 /sal/osl/all | |
| parent | a9d1324b1dbf4a74ee0b02859eb3197005df1bb2 (diff) | |
No need to use SAL_THROW_EXTERN_C macro in CXX
Change-Id: I6eb9f0431a9402479a2d90d5b6f68b611d52a9f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175957
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sal/osl/all')
| -rw-r--r-- | sal/osl/all/debugbase.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index 08fccf50316d..6f409d21c768 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -69,8 +69,7 @@ extern "C" { #pragma clang diagnostic ignored "-Wreturn-type-c-linkage" #endif -osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex() - SAL_THROW_EXTERN_C() +osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex() noexcept { static osl::Mutex aMutex; return aMutex; @@ -79,8 +78,7 @@ osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex() #pragma clang diagnostic pop #endif -bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName ) - SAL_THROW_EXTERN_C() +bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName ) noexcept { std::vector<OString> const& rVec = StaticDebugBaseAddressFilter(); if (rVec.empty()) @@ -95,8 +93,7 @@ bool SAL_CALL osl_detail_ObjectRegistry_storeAddresses( char const* pName ) } bool SAL_CALL osl_detail_ObjectRegistry_checkObjectCount( - osl::detail::ObjectRegistryData const& rData, std::size_t nExpected ) - SAL_THROW_EXTERN_C() + osl::detail::ObjectRegistryData const& rData, std::size_t nExpected ) noexcept { std::size_t nSize; if (rData.m_bStoreAddresses) @@ -113,8 +110,7 @@ bool SAL_CALL osl_detail_ObjectRegistry_checkObjectCount( } void SAL_CALL osl_detail_ObjectRegistry_registerObject( - osl::detail::ObjectRegistryData & rData, void const* pObj ) - SAL_THROW_EXTERN_C() + osl::detail::ObjectRegistryData & rData, void const* pObj ) noexcept { if (rData.m_bStoreAddresses) { osl::MutexGuard const guard( osl_detail_ObjectRegistry_getMutex() ); @@ -128,8 +124,7 @@ void SAL_CALL osl_detail_ObjectRegistry_registerObject( } void SAL_CALL osl_detail_ObjectRegistry_revokeObject( - osl::detail::ObjectRegistryData & rData, void const* pObj ) - SAL_THROW_EXTERN_C() + osl::detail::ObjectRegistryData & rData, void const* pObj ) noexcept { if (rData.m_bStoreAddresses) { osl::MutexGuard const guard( osl_detail_ObjectRegistry_getMutex() ); |