diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-08-04 21:44:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 22:28:18 +0200 |
| commit | 949e6d0a6f2024a9d864fe1ed2d0d1d34838bde6 (patch) | |
| tree | b7d4e8ac75e038b9dd69cb18db2c53541298d8dd /ucb | |
| parent | 417f881d20cafe88a02b64894ba4483875fb9460 (diff) | |
osl::Mutex->std::mutex in fileaccess::FileProvider
Change-Id: Ie110938cc7673739cc31588508987ca18617e5c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120026
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/prov.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/file/prov.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 9fa76da40c1a..dfc4e373d7b8 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -307,7 +307,7 @@ XPropertySetInfoImpl2::hasPropertyByName( void FileProvider::initProperties() { - osl::MutexGuard aGuard( m_aMutex ); + std::scoped_lock aGuard( m_aMutex ); if( m_xPropertySetInfo.is() ) return; diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 84aeb43505ee..c12a87867224 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -19,7 +19,6 @@ #pragma once -#include <osl/mutex.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -32,6 +31,7 @@ #include <com/sun/star/ucb/XFileIdentifierConverter.hpp> #include <cppuhelper/implbase.hxx> #include <memory> +#include <mutex> // FileProvider @@ -145,7 +145,7 @@ namespace fileaccess { css::uno::Reference< css::uno::XComponentContext > m_xContext; void initProperties(); - osl::Mutex m_aMutex; + std::mutex m_aMutex; OUString m_HostName; OUString m_HomeDirectory; sal_Int32 m_FileSystemNotation; |