diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 12:58:46 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:14 +0100 |
commit | 88999eb03b788b83d27d1d784f0ec7ba792ac954 (patch) | |
tree | 9be3f9fb58128a1a25474ffd3b285be0fa439328 /cppuhelper/source/servicemanager.hxx | |
parent | Use cppu::BaseMutex instead of plain osl::Mutex as base (diff) | |
download | core-88999eb03b788b83d27d1d784f0ec7ba792ac954.tar.gz core-88999eb03b788b83d27d1d784f0ec7ba792ac954.zip |
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: Id169891e60eb0a19899586fd3c9a9325ef9d1236
Diffstat (limited to 'cppuhelper/source/servicemanager.hxx')
-rw-r--r-- | cppuhelper/source/servicemanager.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index f62fe1dd7de2..d4f9d7b0beca 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -29,6 +29,7 @@ #include "com/sun/star/lang/XSingleServiceFactory.hpp" #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/Reference.hxx" +#include "cppuhelper/basemutex.hxx" #include "cppuhelper/compbase8.hxx" #include "osl/mutex.hxx" #include "registry/registry.hxx" @@ -57,7 +58,8 @@ typedef cppu::WeakComponentImplHelper8< ServiceManagerBase; class ServiceManager: - private osl::Mutex, public ServiceManagerBase, private boost::noncopyable + private cppu::BaseMutex, public ServiceManagerBase, + private boost::noncopyable { public: struct Data: private boost::noncopyable { @@ -174,7 +176,7 @@ public: ImplementationMap singletons; }; - ServiceManager(): ServiceManagerBase(*static_cast< osl::Mutex * >(this)) {} + ServiceManager(): ServiceManagerBase(m_aMutex) {} using ServiceManagerBase::acquire; using ServiceManagerBase::release; |