From 858c4cd07f22ad0f7dfbb31e55619bcc7d8b1051 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 18 Dec 2021 22:10:52 +0200 Subject: osl::Mutex->std::mutex in SocketConnection Change-Id: Ia63c9cfaf189b328c6fa492bd132f6c9767f573e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127121 Tested-by: Jenkins Reviewed-by: Noel Grandin --- io/source/acceptor/acc_socket.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'io') diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index 50a6db4bc13a..9d4f6fe7fe85 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include @@ -70,7 +70,7 @@ namespace io_acceptor { oslInterlockedCount m_nStatus; OUString m_sDescription; - ::osl::Mutex _mutex; + std::mutex _mutex; bool _started; bool _closed; bool _error; @@ -85,7 +85,7 @@ namespace io_acceptor { XStreamListener_hash_set listeners; { - ::osl::MutexGuard guard(pCon->_mutex); + std::unique_lock guard(pCon->_mutex); if(!*notified) { *notified = true; @@ -253,14 +253,14 @@ namespace io_acceptor { // XConnectionBroadcaster void SAL_CALL SocketConnection::addStreamListener(const Reference & aListener) { - MutexGuard guard(_mutex); + std::unique_lock guard(_mutex); _listeners.insert(aListener); } void SAL_CALL SocketConnection::removeStreamListener(const Reference & aListener) { - MutexGuard guard(_mutex); + std::unique_lock guard(_mutex); _listeners.erase(aListener); } -- cgit