diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-15 15:59:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-16 06:26:22 +0000 |
| commit | acf37c3a0b54a46de29bafd27ec9b0618bd2d84a (patch) | |
| tree | 334c39510e5eb09d2f7aad8edc7b509cb061be2b /vcl/unx | |
| parent | c3bd52f81bf733a0b9b0560794a54b2ac1e0f444 (diff) | |
osl::Mutex->std::mutex in GtkSalData
Change-Id: I86fdee3310715256a76f2b6560d27d3302402ab9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147102
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/gtkdata.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx index cc8535ff2ad2..1fb5c1edfe1f 100644 --- a/vcl/unx/gtk3/gtkdata.cxx +++ b/vcl/unx/gtk3/gtkdata.cxx @@ -358,7 +358,7 @@ GtkSalData::~GtkSalData() // up anyway before the condition they're waiting on gets destroyed. m_aDispatchCondition.set(); - osl::MutexGuard g( m_aDispatchMutex ); + std::unique_lock g( m_aDispatchMutex ); if (m_pUserEvent) { g_source_destroy (m_pUserEvent); @@ -389,7 +389,7 @@ bool GtkSalData::Yield( bool bWait, bool bHandleAllCurrentEvents ) { // release YieldMutex (and re-acquire at block end) SolarMutexReleaser aReleaser; - if( m_aDispatchMutex.tryToAcquire() ) + if( m_aDispatchMutex.try_lock() ) bDispatchThread = true; else if( ! bWait ) { @@ -423,7 +423,7 @@ bool GtkSalData::Yield( bool bWait, bool bHandleAllCurrentEvents ) if( bDispatchThread ) { - m_aDispatchMutex.release(); + m_aDispatchMutex.unlock(); if( bWasEvent ) m_aDispatchCondition.set(); // trigger non dispatch thread yields } |