diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-20 11:13:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-21 08:19:49 +0200 |
| commit | 4c93de2c921b43193985c057b03e329d6dddc5d4 (patch) | |
| tree | 3deccb18a9ebc941f7dcd3ff14780b8dcd9951f2 /vcl/osx | |
| parent | ec665e3e898e733c9f602b21046079e569b58568 (diff) | |
merge GenericSolarMutex and SolarMutex
Since nothing else is implementing the SolarMutex abstract class.
Change-Id: I2a41254af3e9c7534033cdd0bece9dd8e0258b9d
Reviewed-on: https://gerrit.libreoffice.org/56153
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salinst.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 972a7fafcd76..b046fda9f4e2 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -318,7 +318,7 @@ void SalYieldMutex::doAcquire( sal_uInt32 nLockCount ) ++m_nCount; --nLockCount; - comphelper::GenericSolarMutex::doAcquire( nLockCount ); + comphelper::SolarMutex::doAcquire( nLockCount ); } sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll ) @@ -331,7 +331,7 @@ sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll ) std::unique_lock<std::mutex> g(m_runInMainMutex); // read m_nCount before doRelease bool const isReleased(bUnlockAll || m_nCount == 1); - nCount = comphelper::GenericSolarMutex::doRelease( bUnlockAll ); + nCount = comphelper::SolarMutex::doRelease( bUnlockAll ); if (isReleased && !pInst->IsMainThread()) { m_wakeUpMain = true; m_aInMainCondition.notify_all(); @@ -343,7 +343,7 @@ sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll ) bool SalYieldMutex::IsCurrentThread() const { if ( !GetSalData()->mpInstance->mbNoYieldLock ) - return comphelper::GenericSolarMutex::IsCurrentThread(); + return comphelper::SolarMutex::IsCurrentThread(); else return GetSalData()->mpInstance->IsMainThread(); } |