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 /dbaccess/source/core/recovery | |
| 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 'dbaccess/source/core/recovery')
| -rw-r--r-- | dbaccess/source/core/recovery/settingsimport.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/core/recovery/subcomponentloader.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 0f92f496012a..614c268d4b86 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -60,13 +60,13 @@ namespace dbaccess //-------------------------------------------------------------------- oslInterlockedCount SAL_CALL SettingsImport::acquire() { - return osl_incrementInterlockedCount( &m_refCount ); + return osl_atomic_increment( &m_refCount ); } //-------------------------------------------------------------------- oslInterlockedCount SAL_CALL SettingsImport::release() { - oslInterlockedCount newCount = osl_decrementInterlockedCount( &m_refCount ); + oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount ); if ( newCount == 0 ) delete this; return newCount; diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx index 5e3e86785b45..7238b39930e8 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.cxx +++ b/dbaccess/source/core/recovery/subcomponentloader.cxx @@ -120,11 +120,11 @@ namespace dbaccess Reference< XController2 > xController( i_rApplicationController, UNO_QUERY_THROW ); m_pData->xAppComponentWindow.set( xController->getComponentWindow(), UNO_SET_THROW ); - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { m_pData->xAppComponentWindow->addWindowListener( this ); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } //-------------------------------------------------------------------- @@ -136,11 +136,11 @@ namespace dbaccess Reference< XController2 > xController( i_rApplicationController, UNO_QUERY_THROW ); m_pData->xAppComponentWindow.set( xController->getComponentWindow(), UNO_SET_THROW ); - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); { m_pData->xAppComponentWindow->addWindowListener( this ); } - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } //-------------------------------------------------------------------- |