diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-17 22:42:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-19 11:19:12 +0100 |
| commit | 3152f5a33e787e33ec0dfef8c75d7bbf95194c00 (patch) | |
| tree | cc1049cdf9424a5891ca5e255374ef9ca0ff57f5 /javaunohelper | |
| parent | 729834abac1618aa2f0dcc6d774deb74f7c42bb3 (diff) | |
use more cppu::BaseMutex
Change-Id: Iddd7438161ead93b27cf8e8058ca5b1eae3d8001
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127075
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'javaunohelper')
| -rw-r--r-- | javaunohelper/source/vm.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx index b3643acc78e2..c5f2c577417a 100644 --- a/javaunohelper/source/vm.cxx +++ b/javaunohelper/source/vm.cxx @@ -26,20 +26,17 @@ #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/component_context.hxx> +#include <cppuhelper/basemutex.hxx> #include <jvmaccess/virtualmachine.hxx> #include <jvmaccess/unovirtualmachine.hxx> #include <osl/mutex.hxx> namespace { -struct MutexHolder -{ - ::osl::Mutex m_mutex; -}; typedef ::cppu::WeakComponentImplHelper< css::lang::XSingleComponentFactory > t_impl; -class SingletonFactory : public MutexHolder, public t_impl +class SingletonFactory : public cppu::BaseMutex, public t_impl { ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > m_vm_access; @@ -48,7 +45,7 @@ protected: public: explicit SingletonFactory( ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > const & vm_access ) - : t_impl( m_mutex ), + : t_impl( m_aMutex ), m_vm_access( vm_access ) {} |