diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-07 13:42:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-08 09:33:51 +0000 |
| commit | 8521c5b4d61df2339e656c052853fce8d6b9c536 (patch) | |
| tree | bd363ded68f39e625aabcc121649b4447736bda8 | |
| parent | 32cf9f7f0ba674217b809674eb9a951ea1b0c9c3 (diff) | |
osl::Mutex->std::mutex in PackageManagerImpl
Change-Id: I613a8846270f4b42125f24d9a7b99ecc12e2edb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148434
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index d4226aa6d4c4..570f8be23330 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -791,7 +791,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( { OUString const id = dp_misc::getIdentifier( xPackage ); - ::osl::MutexGuard g(m_addMutex); + std::unique_lock g(m_addMutex); if (isInstalled(xPackage)) { //Do not guard the complete function with the getMutex diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index a2079da23adc..dce57d418e3f 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -27,6 +27,7 @@ #include <com/sun/star/deployment/XPackageRegistry.hpp> #include <com/sun/star/deployment/XPackageManager.hpp> #include <memory> +#include <mutex> #include <string_view> #include <utility> @@ -49,7 +50,7 @@ class PackageManagerImpl final : private cppu::BaseMutex, public t_pm_helper OUString m_activePackages_expanded; std::unique_ptr< ActivePackages > m_activePackagesDB; //This mutex is only used for synchronization in addPackage - ::osl::Mutex m_addMutex; + std::mutex m_addMutex; css::uno::Reference<css::ucb::XProgressHandler> m_xLogFile; inline void logIntern( css::uno::Any const & status ); void fireModified(); |