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 /xmloff | |
| 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 'xmloff')
| -rw-r--r-- | xmloff/inc/xmloff/uniref.hxx | 3 | ||||
| -rw-r--r-- | xmloff/source/forms/handler/property_handler_base.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/style/uniref.cxx | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/xmloff/inc/xmloff/uniref.hxx b/xmloff/inc/xmloff/uniref.hxx index 2deedcf69569..808ed8212b97 100644 --- a/xmloff/inc/xmloff/uniref.hxx +++ b/xmloff/inc/xmloff/uniref.hxx @@ -105,8 +105,9 @@ public: {} virtual ~UniRefBase(); - void acquire() { osl_incrementInterlockedCount( &m_refCount ); } + void acquire() { osl_atomic_increment( &m_refCount ); } void release(); + }; /////////////////////////////////////////////////////////////////////////////// diff --git a/xmloff/source/forms/handler/property_handler_base.cxx b/xmloff/source/forms/handler/property_handler_base.cxx index 6dd0c8512bc2..92aeeaca38b1 100644 --- a/xmloff/source/forms/handler/property_handler_base.cxx +++ b/xmloff/source/forms/handler/property_handler_base.cxx @@ -20,10 +20,8 @@ #include "property_handler_base.hxx" -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... //================================================================================================================== //= PropertyHandlerBase @@ -36,20 +34,18 @@ namespace xmloff //------------------------------------------------------------------------------------------------------------------ oslInterlockedCount SAL_CALL PropertyHandlerBase::acquire() { - return osl_incrementInterlockedCount( &m_refCount ); + return osl_atomic_increment( &m_refCount ); } //------------------------------------------------------------------------------------------------------------------ oslInterlockedCount SAL_CALL PropertyHandlerBase::release() { - oslInterlockedCount decremented = osl_decrementInterlockedCount( &m_refCount ); + oslInterlockedCount decremented = osl_atomic_decrement( &m_refCount ); if ( 0 == decremented ) delete this; return decremented; } -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/uniref.cxx b/xmloff/source/style/uniref.cxx index 955f63c914c5..18f85c7f4343 100644 --- a/xmloff/source/style/uniref.cxx +++ b/xmloff/source/style/uniref.cxx @@ -25,7 +25,7 @@ UniRefBase::~UniRefBase() void UniRefBase::release() { - if( !osl_decrementInterlockedCount( &m_refCount ) ) + if( !osl_atomic_decrement( &m_refCount ) ) delete this; } |