io/source/acceptor/acc_pipe.cxx | 4 ++-- io/source/acceptor/acceptor.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 86aa6ad680998d2e854b964f63b51a2c7d98251a Author: Noel Grandin <[email protected]> AuthorDate: Sat Dec 18 22:11:49 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Dec 20 08:32:43 2021 +0100 osl::Mutex->std::mutex in PipeAcceptor Change-Id: Iafe6c0238d5a00bbf3c586b36c10ea7793f466b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127122 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index 62f90993dca7..d95ea998e6c1 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -144,7 +144,7 @@ namespace io_acceptor { Pipe pipe; { - MutexGuard guard( m_mutex ); + std::unique_lock guard( m_mutex ); pipe = m_pipe; } if( ! pipe.is() ) @@ -177,7 +177,7 @@ namespace io_acceptor m_bClosed = true; Pipe pipe; { - MutexGuard guard( m_mutex ); + std::unique_lock guard( m_mutex ); pipe = m_pipe; m_pipe.clear(); } diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx index 0ebe00c9e372..9214a10b7509 100644 --- a/io/source/acceptor/acceptor.hxx +++ b/io/source/acceptor/acceptor.hxx @@ -21,7 +21,7 @@ #include <osl/pipe.hxx> #include <osl/socket.hxx> -#include <osl/mutex.hxx> +#include <mutex> #include <com/sun/star/uno/Reference.hxx> @@ -39,7 +39,7 @@ namespace io_acceptor { void stopAccepting(); - ::osl::Mutex m_mutex; + std::mutex m_mutex; ::osl::Pipe m_pipe; OUString m_sPipeName; OUString m_sConnectionDescription;
