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 /odk | |
| 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 'odk')
4 files changed, 9 insertions, 9 deletions
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx index dbd11bcecd8a..c3eabe23b8a9 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx +++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx @@ -150,14 +150,14 @@ void MyService1Impl::acquire() throw () { // thread-safe incrementation of reference count - ::osl_incrementInterlockedCount( &m_refcount ); + ::osl_atomic_increment( &m_refcount ); } void MyService1Impl::release() throw () { // thread-safe decrementation of reference count - if (0 == ::osl_decrementInterlockedCount( &m_refcount )) + if (0 == ::osl_atomic_decrement( &m_refcount )) { delete this; // shutdown this object } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx index 0713384a8df9..bfb252951b12 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx @@ -80,7 +80,7 @@ void SAL_CALL OConnection::release() throw() //----------------------------------------------------------------------------- void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); // some example code how to get the information out of the sequence @@ -129,7 +129,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV } m_sUser = aUID; - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } // XServiceInfo // -------------------------------------------------------------------------------- diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx index 4b424beaa1ea..05c74a020ecb 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx @@ -52,9 +52,9 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) OSL_ENSURE(m_pConnection,"ODatabaseMetaData::ODatabaseMetaData: No connection set!"); if(!m_pConnection->isCatalogUsed()) { - osl_incrementInterlockedCount( &m_refCount ); + osl_atomic_increment( &m_refCount ); m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); - osl_decrementInterlockedCount( &m_refCount ); + osl_atomic_decrement( &m_refCount ); } } // ------------------------------------------------------------------------- diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx index 0318a1b66f01..9eb10f3f58ad 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx @@ -166,9 +166,9 @@ void release(oslInterlockedCount& _refCount, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, ::com::sun::star::lang::XComponent* _pObject) { - if (osl_decrementInterlockedCount( &_refCount ) == 0) + if (osl_atomic_decrement( &_refCount ) == 0) { - osl_incrementInterlockedCount( &_refCount ); + osl_atomic_increment( &_refCount ); if (!rBHelper.bDisposed && !rBHelper.bInDispose) { @@ -195,7 +195,7 @@ void release(oslInterlockedCount& _refCount, } } else - osl_incrementInterlockedCount( &_refCount ); + osl_atomic_increment( &_refCount ); } void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) |