include/cppuhelper/implbase_ex_post.hxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit e179de871b09cc2242e998fde8387cd666f1e9f6 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Wed May 19 12:18:47 2021 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Wed May 19 13:18:48 2021 +0200 Remaining loplugin:noexcept in URE include files This file is only included from CppunitTest_odk_checkapi. As that is compiled with $(gb_CXX03FLAGS), loplugin:noexcept hasn't caught these on Linux or macOS (see the comment in Noexcept::run, compilerplugins/clang/noexcept.cxx). And while the plugin could have caught them with clang-cl on Windows (cf. 95d109fd5f254f694684c0effe447f133872f40d "Document that setting gb_CXX03FLAGS for clang-cl doesn't work", all the instances are in macro definitions that are never expanded by any LO code. Change-Id: Ia3f3a0cd89df15bee517cd3a91a2a12a15a7a279 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115794 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/include/cppuhelper/implbase_ex_post.hxx b/include/cppuhelper/implbase_ex_post.hxx index 599b45288e3c..d1a51c9eb165 100644 --- a/include/cppuhelper/implbase_ex_post.hxx +++ b/include/cppuhelper/implbase_ex_post.hxx @@ -73,9 +73,9 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper##N \ public: \ virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & rType ) SAL_OVERRIDE \ { return WeakImplHelper_query( rType, (class_data *)&s_cd, this, static_cast<OWeakObject *>(this) ); } \ - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE \ + virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE \ { OWeakObject::acquire(); } \ - virtual void SAL_CALL release() throw () SAL_OVERRIDE \ + virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE \ { OWeakObject::release(); } \ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE \ { return WeakImplHelper_getTypes( (class_data *)&s_cd ); } \ @@ -97,9 +97,9 @@ public: \ { return OWeakAggObject::queryInterface( rType ); } \ virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) SAL_OVERRIDE \ { return WeakAggImplHelper_queryAgg( rType, (class_data *)&s_cd, this, static_cast<OWeakAggObject *>(this) ); } \ - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE \ + virtual void SAL_CALL acquire() SAL_NOEXCEPT SAL_OVERRIDE \ { OWeakAggObject::acquire(); } \ - virtual void SAL_CALL release() throw () SAL_OVERRIDE \ + virtual void SAL_CALL release() SAL_NOEXCEPT SAL_OVERRIDE \ { OWeakAggObject::release(); } \ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE \ { return WeakAggImplHelper_getTypes( (class_data *)&s_cd ); } \ @@ -123,9 +123,9 @@ public: \ return aRet; \ return BaseClass::queryInterface( rType ); \ } \ - virtual void SAL_CALL acquire() throw () \ + virtual void SAL_CALL acquire() SAL_NOEXCEPT \ { BaseClass::acquire(); } \ - virtual void SAL_CALL release() throw () \ + virtual void SAL_CALL release() SAL_NOEXCEPT \ { BaseClass::release(); } \ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() \ { return ImplInhHelper_getTypes( (class_data *)&s_cd, BaseClass::getTypes() ); } \ @@ -151,9 +151,9 @@ public: \ return aRet; \ return BaseClass::queryAggregation( rType ); \ } \ - virtual void SAL_CALL acquire() throw () \ + virtual void SAL_CALL acquire() SAL_NOEXCEPT \ { BaseClass::acquire(); } \ - virtual void SAL_CALL release() throw () \ + virtual void SAL_CALL release() SAL_NOEXCEPT \ { BaseClass::release(); } \ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() \ { return ImplInhHelper_getTypes( (class_data *)&s_cd, BaseClass::getTypes() ); } \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits