diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-22 01:51:12 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-25 01:55:38 +0000 |
| commit | 750fc206113a796035cbc05fb904fbae0eb771a8 (patch) | |
| tree | 4ea1f0378c2b6d7f50480d3b9051de91780219cd /basic | |
| parent | bcd2b017088822ea95e9d33d1d0dc360c0ec8d74 (diff) | |
replace remaining InterlockedCount() with inlined version
Change-Id: Ifcfa48fc87f905a91470a5b0fd597b02f220784c
Reviewed-on: https://gerrit.libreoffice.org/671
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 8 | ||||
| -rw-r--r-- | basic/source/uno/namecont.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index f851b5a057aa..3257a4ad5214 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -173,7 +173,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV if ( m_xAggProxy.is() ) { - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); /* i35609 - Fix crash on Solaris. The setDelegator call needs to be in its own block to ensure that all temporary Reference @@ -183,7 +183,7 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV m_xAggProxy->setDelegator( static_cast< cppu::OWeakObject * >( this ) ); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } } } @@ -192,13 +192,13 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pV void SAL_CALL DocObjectWrapper::acquire() throw () { - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); OSL_TRACE("DocObjectWrapper::acquire(%s) 0x%x refcount is now %d", rtl::OUStringToOString( mName, RTL_TEXTENCODING_UTF8 ).getStr(), this, m_refCount ); } void SAL_CALL DocObjectWrapper::release() throw () { - if ( osl_decrementInterlockedCount( &m_refCount ) == 0 ) + if ( osl_atomic_decrement( &m_refCount ) == 0 ) { OSL_TRACE("DocObjectWrapper::release(%s) 0x%x refcount is now %d", rtl::OUStringToOString( mName, RTL_TEXTENCODING_UTF8 ).getStr(), this, m_refCount ); delete this; diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 091f04f96bbb..f8d946edd69c 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -578,9 +578,9 @@ void SfxLibraryContainer::init( const OUString& rInitialDocumentURL, const uno:: // this might be called from within the ctor, and the impl_init might (indirectly) create // an UNO reference to ourself. // Ensure that we're not destroyed while we're in here - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); init_Impl( rInitialDocumentURL, rxInitialStorage ); - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL, |