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/win | |
| 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/win')
| -rw-r--r-- | vcl/win/app/salinst.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index cfdc68b4ac43..468cff39f485 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -86,7 +86,7 @@ void SalAbort( const OUString& rErrorText, bool ) LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); -class SalYieldMutex : public comphelper::GenericSolarMutex +class SalYieldMutex : public comphelper::SolarMutex { public: // for ImplSalYield() and ImplSalYieldMutexAcquireWithWait() osl::Condition m_condition; /// for MsgWaitForMultipleObjects() @@ -154,7 +154,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 ) @@ -163,7 +163,7 @@ sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll ) if ( pInst && pInst->mbNoYieldLock && pInst->IsMainThread() ) return 1; - sal_uInt32 nCount = comphelper::GenericSolarMutex::doRelease( bUnlockAll ); + sal_uInt32 nCount = comphelper::SolarMutex::doRelease( bUnlockAll ); // wake up ImplSalYieldMutexAcquireWithWait() after release if ( 0 == m_nCount ) m_condition.set(); @@ -178,7 +178,7 @@ bool SalYieldMutex::tryToAcquire() if ( pInst->mbNoYieldLock && pInst->IsMainThread() ) return true; else - return comphelper::GenericSolarMutex::tryToAcquire(); + return comphelper::SolarMutex::tryToAcquire(); } else return false; |