diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2020-02-16 13:05:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-17 08:59:01 +0100 |
commit | 6be9ae8aa1d3b164f3953dbc1cb7f0f1c1976d9b (patch) | |
tree | 244d93b2f30894d9367aae54d76b962e53a165f2 /ucbhelper | |
parent | ea0701aab307a549cf6cad1d309cab1bf11ef436 (diff) |
inline some acquire/release calls
because these are all on the hot path, and in the best case, with
enough inlining, the compiler can skip the call altogether and just
do a locked CMPXHG instruction
Change-Id: I099d6385f602e40e1767f9f1002b7514ecf436e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88775
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucbhelper')
-rw-r--r-- | ucbhelper/source/provider/contenthelper.cxx | 6 | ||||
-rw-r--r-- | ucbhelper/source/provider/interactionrequest.cxx | 110 |
2 files changed, 0 insertions, 116 deletions
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index 01ebcee1ca71..c29442978af8 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -138,12 +138,6 @@ ContentImplHelper::~ContentImplHelper() { } -void SAL_CALL ContentImplHelper::acquire() - throw() -{ - cppu::OWeakObject::acquire(); -} - void SAL_CALL ContentImplHelper::release() throw() { diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 0dbc568fcaa7..95ed4199426e 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -152,22 +152,6 @@ void InteractionContinuation::recordSelection() // virtual -void SAL_CALL InteractionAbort::acquire() - throw() -{ - OWeakObject::acquire(); -} - - -// virtual -void SAL_CALL InteractionAbort::release() - throw() -{ - OWeakObject::release(); -} - - -// virtual uno::Any SAL_CALL InteractionAbort::queryInterface( const uno::Type & rType ) { @@ -219,22 +203,6 @@ void SAL_CALL InteractionAbort::select() // virtual -void SAL_CALL InteractionRetry::acquire() - throw() -{ - OWeakObject::acquire(); -} - - -// virtual -void SAL_CALL InteractionRetry::release() - throw() -{ - OWeakObject::release(); -} - - -// virtual uno::Any SAL_CALL InteractionRetry::queryInterface( const uno::Type & rType ) { @@ -286,22 +254,6 @@ void SAL_CALL InteractionRetry::select() // virtual -void SAL_CALL InteractionApprove::acquire() - throw() -{ - OWeakObject::acquire(); -} - - -// virtual -void SAL_CALL InteractionApprove::release() - throw() -{ - OWeakObject::release(); -} - - -// virtual uno::Any SAL_CALL InteractionApprove::queryInterface( const uno::Type & rType ) { @@ -353,22 +305,6 @@ void SAL_CALL InteractionApprove::select() // virtual -void SAL_CALL InteractionDisapprove::acquire() - throw() -{ - OWeakObject::acquire(); -} - - -// virtual -void SAL_CALL InteractionDisapprove::release() - throw() -{ - OWeakObject::release(); -} - - -// virtual uno::Any SAL_CALL InteractionDisapprove::queryInterface( const uno::Type & rType ) { @@ -420,22 +356,6 @@ void SAL_CALL InteractionDisapprove::select() // virtual -void SAL_CALL InteractionSupplyAuthentication::acquire() - throw() -{ - OWeakObject::acquire(); -} - - -// virtual -void SAL_CALL InteractionSupplyAuthentication::release() - throw() -{ - OWeakObject::release(); -} - - -// virtual uno::Any SAL_CALL InteractionSupplyAuthentication::queryInterface( const uno::Type & rType ) { @@ -627,22 +547,6 @@ void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials( // virtual -void SAL_CALL InteractionReplaceExistingData::acquire() - throw() -{ - OWeakObject::acquire(); -} - - -// virtual -void SAL_CALL InteractionReplaceExistingData::release() - throw() -{ - OWeakObject::release(); -} - - -// virtual uno::Any SAL_CALL InteractionReplaceExistingData::queryInterface( const uno::Type & rType ) { @@ -692,20 +596,6 @@ void SAL_CALL InteractionReplaceExistingData::select() // XInterface methods. // virtual -void SAL_CALL InteractionAuthFallback::acquire() - throw() -{ - OWeakObject::acquire(); -} - -// virtual -void SAL_CALL InteractionAuthFallback::release() - throw() -{ - OWeakObject::release(); -} - -// virtual uno::Any SAL_CALL InteractionAuthFallback::queryInterface( const uno::Type & rType ) { |