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 /ucb/workben | |
| 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 'ucb/workben')
| -rw-r--r-- | ucb/workben/cachemap/cachemapobject1.cxx | 2 | ||||
| -rw-r--r-- | ucb/workben/cachemap/cachemapobject1.hxx | 2 | ||||
| -rw-r--r-- | ucb/workben/cachemap/cachemapobject3.cxx | 8 | ||||
| -rw-r--r-- | ucb/workben/cachemap/cachemapobject3.hxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/ucb/workben/cachemap/cachemapobject1.cxx b/ucb/workben/cachemap/cachemapobject1.cxx index fdd05c5d8c0f..7e5b5b4ff836 100644 --- a/ucb/workben/cachemap/cachemapobject1.cxx +++ b/ucb/workben/cachemap/cachemapobject1.cxx @@ -46,7 +46,7 @@ void ObjectContainer1::releaseElement(Object1 * pElement) SAL_THROW(()) bool bDelete = false; { osl::MutexGuard aGuard(m_aMutex); - if (osl_decrementInterlockedCount(&pElement->m_nRefCount) == 0) + if (osl_atomic_decrement(&pElement->m_nRefCount) == 0) { m_aMap.erase(pElement->m_aContainerIt); bDelete = true; diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx index 34b7e5e47662..7e20a4eaa757 100644 --- a/ucb/workben/cachemap/cachemapobject1.hxx +++ b/ucb/workben/cachemap/cachemapobject1.hxx @@ -58,7 +58,7 @@ class Object1 { public: inline void acquire() SAL_THROW(()) - { osl_incrementInterlockedCount(&m_nRefCount); } + { osl_atomic_increment(&m_nRefCount); } inline void release() SAL_THROW(()) { m_xContainer->releaseElement(this); } diff --git a/ucb/workben/cachemap/cachemapobject3.cxx b/ucb/workben/cachemap/cachemapobject3.cxx index b7cb5552b402..7ecd50a9ff60 100644 --- a/ucb/workben/cachemap/cachemapobject3.cxx +++ b/ucb/workben/cachemap/cachemapobject3.cxx @@ -42,7 +42,7 @@ inline Object3::~Object3() SAL_THROW(()) void Object3::release() SAL_THROW(()) { - if (osl_decrementInterlockedCount(&m_nRefCount) == 0) + if (osl_atomic_decrement(&m_nRefCount) == 0) { m_xContainer->releaseElement(this); delete this; @@ -75,15 +75,15 @@ rtl::Reference< Object3 > ObjectContainer3::get(rtl::OUString const & rKey) xElement.release(); return aIt->second; } - else if (osl_incrementInterlockedCount(&aIt->second->m_nRefCount) > 1) + else if (osl_atomic_increment(&aIt->second->m_nRefCount) > 1) { rtl::Reference< Object3 > xElement(aIt->second); - osl_decrementInterlockedCount(&aIt->second->m_nRefCount); + osl_atomic_decrement(&aIt->second->m_nRefCount); return xElement; } else { - osl_decrementInterlockedCount(&aIt->second->m_nRefCount); + osl_atomic_decrement(&aIt->second->m_nRefCount); aIt->second->m_aContainerIt = m_aMap.end(); aIt->second = new Object3(this); aIt->second->m_aContainerIt = aIt; diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx index 279436d4b74d..181e18dc503b 100644 --- a/ucb/workben/cachemap/cachemapobject3.hxx +++ b/ucb/workben/cachemap/cachemapobject3.hxx @@ -58,7 +58,7 @@ class Object3 { public: inline void acquire() SAL_THROW(()) - { osl_incrementInterlockedCount(&m_nRefCount); } + { osl_atomic_increment(&m_nRefCount); } void release() SAL_THROW(()); |