diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-07 13:43:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-08 06:43:54 +0000 |
| commit | f7d6f437ad81cc51d78cffb413dd90a7a8dd960d (patch) | |
| tree | 844f00d2eaaf891d98b881a059478265d8cb32c1 | |
| parent | 838036c304d474fc4c19e2fc59cadc6ba457c9ee (diff) | |
osl::Mutex->std::mutex in ExtensionManager
Change-Id: I33c39076093dc0c23b5e7c85cbdf0a88e6231d2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148435
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/manager/dp_extensionmanager.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 44bd4648eff0..b51f4c77b47b 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -627,7 +627,7 @@ Reference<css::deployment::XPackage> ExtensionManager::addExtension( static_cast<cppu::OWeakObject*>(this), 0); //We must make sure that the xTmpExtension is not create twice, because this //would remove the first one. - ::osl::MutexGuard addGuard(m_addMutex); + std::unique_lock addGuard(m_addMutex); Reference<css::deployment::XPackageManager> xTmpRepository(getTmpRepository()); // make sure xTmpRepository is alive as long as xTmpExtension is; as diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 0e08314c36f6..a70f4fbd2e26 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/deployment/XPackageManagerFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <osl/mutex.hxx> +#include <mutex> #include <vector> #include <unordered_map> @@ -146,7 +146,7 @@ private: css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory; //only to be used within addExtension - ::osl::Mutex m_addMutex; + std::mutex m_addMutex; /* contains the names of all repositories (except tmp) in order of there priority. That is, the first element is "user" followed by "shared" and then "bundled" |