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>

4 files changed, 8 insertions, 8 deletions

diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 1a1ab13bec10..396f0e1984fd 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -193,7 +193,7 @@ inline AdapterImpl::~AdapterImpl()
 inline void AdapterImpl::acquire()
     SAL_THROW(())
 {
-    ::osl_incrementInterlockedCount( &m_nRef );
+    ::osl_atomic_increment( &m_nRef );
 }
 //______________________________________________________________________________
 inline void AdapterImpl::release()
@@ -202,7 +202,7 @@ inline void AdapterImpl::release()
     bool delete_this = false;
     {
     MutexGuard guard( m_pFactory->m_mutex );
-    if (! ::osl_decrementInterlockedCount( &m_nRef ))
+    if (! ::osl_atomic_decrement( &m_nRef ))
     {
         t_ptr_map::iterator iFind(
             m_pFactory->m_receiver2adapters.find( m_key ) );
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index a3f2177ed4d1..54868e4766f0 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -217,7 +217,7 @@ static void SAL_CALL binuno_proxy_free(
 static void SAL_CALL binuno_proxy_acquire( uno_Interface * pUnoI )
 {
     binuno_Proxy * that = static_cast< binuno_Proxy * >( pUnoI );
-    if (osl_incrementInterlockedCount( &that->m_nRefCount ) == 1)
+    if (osl_atomic_increment( &that->m_nRefCount ) == 1)
     {
         // rebirth of zombie
         uno_ExtEnvironment * uno_env =
@@ -236,7 +236,7 @@ static void SAL_CALL binuno_proxy_acquire( uno_Interface * pUnoI )
 static void SAL_CALL binuno_proxy_release( uno_Interface * pUnoI )
 {
     binuno_Proxy * that = static_cast< binuno_Proxy * >( pUnoI );
-    if (osl_decrementInterlockedCount( &that->m_nRefCount ) == 0)
+    if (osl_atomic_decrement( &that->m_nRefCount ) == 0)
     {
         uno_ExtEnvironment * uno_env =
             that->m_root->m_factory->m_uno_env.get()->pExtEnv;
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 7a6b4de5e797..ae72ae89ac3c 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -301,13 +301,13 @@ acc_CurrentContext::~acc_CurrentContext()
 void acc_CurrentContext::acquire()
     throw ()
 {
-    ::osl_incrementInterlockedCount( &m_refcount );
+    ::osl_atomic_increment( &m_refcount );
 }
 //__________________________________________________________________________________________________
 void acc_CurrentContext::release()
     throw ()
 {
-    if (! ::osl_decrementInterlockedCount( &m_refcount ))
+    if (! ::osl_atomic_decrement( &m_refcount ))
     {
         delete this;
     }
diff --git a/stoc/test/security/test_security.cxx b/stoc/test/security/test_security.cxx
index 798370fc68b3..a094b21e2402 100644
--- a/stoc/test/security/test_security.cxx
+++ b/stoc/test/security/test_security.cxx
@@ -108,13 +108,13 @@ public:
 void user_CurrentContext::acquire()
     throw ()
 {
-    ::osl_incrementInterlockedCount( &m_refcount );
+    ::osl_atomic_increment( &m_refcount );
 }
 //__________________________________________________________________________________________________
 void user_CurrentContext::release()
     throw ()
 {
-    if (! ::osl_decrementInterlockedCount( &m_refcount ))
+    if (! ::osl_atomic_decrement( &m_refcount ))
     {
         delete this;
     }