diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-18 22:10:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-20 08:33:02 +0100 |
| commit | 858c4cd07f22ad0f7dfbb31e55619bcc7d8b1051 (patch) | |
| tree | d93b58e81571599bdffa9ed573987b3562e7709c /io | |
| parent | 86aa6ad680998d2e854b964f63b51a2c7d98251a (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'io')
| -rw-r--r-- | io/source/acceptor/acc_socket.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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 <unordered_set> -#include <osl/mutex.hxx> +#include <mutex> #include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> #include <com/sun/star/connection/XConnection.hpp> @@ -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<XStreamListener> & aListener) { - MutexGuard guard(_mutex); + std::unique_lock guard(_mutex); _listeners.insert(aListener); } void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener) { - MutexGuard guard(_mutex); + std::unique_lock guard(_mutex); _listeners.erase(aListener); } |