mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osl::Mutex->std::mutex in PipeAcceptor

Browse Source 
Change-Id: Iafe6c0238d5a00bbf3c586b36c10ea7793f466b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127122
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2021-12-18 22:11:49 +02:00
committed by Noel Grandin
parent 5f4a580ea1
commit 86aa6ad680
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
io/source/acceptor/acc_pipe.cxx
View File

@@ -144,7 +144,7 @@ namespace io_acceptor
{ {
Pipe pipe; Pipe pipe;
{ {
MutexGuard guard( m_mutex ); std::unique_lock guard( m_mutex );
pipe = m_pipe; pipe = m_pipe;
} }
if( ! pipe.is() ) if( ! pipe.is() )
@@ -177,7 +177,7 @@ namespace io_acceptor
m_bClosed = true; m_bClosed = true;
Pipe pipe; Pipe pipe;
{ {
MutexGuard guard( m_mutex ); std::unique_lock guard( m_mutex );
pipe = m_pipe; pipe = m_pipe;
m_pipe.clear(); m_pipe.clear();
} }

4
io/source/acceptor/acceptor.hxx
View File

@@ -21,7 +21,7 @@
#include <osl/pipe.hxx> #include <osl/pipe.hxx>
#include <osl/socket.hxx> #include <osl/socket.hxx>
#include <osl/mutex.hxx> #include <mutex>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
@@ -39,7 +39,7 @@ namespace io_acceptor {
void stopAccepting(); void stopAccepting();
::osl::Mutex m_mutex; std::mutex m_mutex;
::osl::Pipe m_pipe; ::osl::Pipe m_pipe;
OUString m_sPipeName; OUString m_sPipeName;
OUString m_sConnectionDescription; OUString m_sConnectionDescription;