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 /cli_ure | |
| 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 'cli_ure')
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 4 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_proxy.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index aed48dfb6e29..53329e8d80b6 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -187,7 +187,7 @@ namespace cli_uno */ void Bridge::acquire() const SAL_THROW(()) { - if (1 == osl_incrementInterlockedCount( &m_ref )) + if (1 == osl_atomic_increment( &m_ref )) { if (m_registered_cli2uno) { @@ -206,7 +206,7 @@ void Bridge::acquire() const SAL_THROW(()) //__________________________________________________________________________________________________ void Bridge::release() const SAL_THROW(()) { - if (! osl_decrementInterlockedCount( &m_ref )) + if (! osl_atomic_decrement( &m_ref )) { uno_revokeMapping( m_registered_cli2uno diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 76a58dd29a64..2fd70fc5ede3 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -909,7 +909,7 @@ void SAL_CALL CliProxy::uno_DispatchMethod( } inline void CliProxy::acquire() const { - if (1 == osl_incrementInterlockedCount( &m_ref )) + if (1 == osl_atomic_increment( &m_ref )) { // rebirth of proxy zombie void * that = const_cast< CliProxy * >( this ); @@ -926,7 +926,7 @@ inline void CliProxy::acquire() const //--------------------------------------------------------------------------- inline void CliProxy::release() const { - if (0 == osl_decrementInterlockedCount( &m_ref )) + if (0 == osl_atomic_decrement( &m_ref )) { // revoke from uno env on last release, // The proxy can be resurrected if acquire is called before the uno |