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 /bridges/test | |
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 'bridges/test')
-rw-r--r-- | bridges/test/java_uno/acquire/testacquire.cxx | 4 | ||||
-rw-r--r-- | bridges/test/performance/testperformance.cxx | 2 | ||||
-rw-r--r-- | bridges/test/testcomp.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index fcf7fde15099..f3216fb15a07 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -99,7 +99,7 @@ public: throw (css::uno::RuntimeException); virtual void SAL_CALL acquire() throw () - { osl_incrementInterlockedCount(&m_refCount); } + { osl_atomic_increment(&m_refCount); } virtual void SAL_CALL release() throw (); @@ -125,7 +125,7 @@ css::uno::Any Interface::queryInterface(css::uno::Type const & type) } void Interface::release() throw () { - if (osl_decrementInterlockedCount(&m_refCount) == 0) { + if (osl_atomic_decrement(&m_refCount) == 0) { delete this; } } diff --git a/bridges/test/performance/testperformance.cxx b/bridges/test/performance/testperformance.cxx index 87fcd910cb11..36102aca31c4 100644 --- a/bridges/test/performance/testperformance.cxx +++ b/bridges/test/performance/testperformance.cxx @@ -95,7 +95,7 @@ void main() oslInterlockedCount count; for( int i = 0 ; i < 1000*10000 ; i ++ ) { - osl_incrementInterlockedCount( &count ); + osl_atomic_increment( &count ); } } { diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 26885b295224..16fa2d4958d9 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -157,9 +157,9 @@ public: return aRet; } virtual void SAL_CALL acquire() throw() - { osl_incrementInterlockedCount( &_nRef ); } + { osl_atomic_increment( &_nRef ); } virtual void SAL_CALL release() throw() - { if (! osl_decrementInterlockedCount( &_nRef )) delete this; } + { if (! osl_atomic_decrement( &_nRef )) delete this; } // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); |