diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:02:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:14 +0100 |
| commit | db9d30a8ee01d5a737a769251eed784929875af1 (patch) | |
| tree | d9b56b3095afaeb0164d838aea5f0d86bd263eba /stoc | |
| parent | 88999eb03b788b83d27d1d784f0ec7ba792ac954 (diff) | |
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: Ic7bd99f920fc954e2eeb734e324d15b1af01e30d
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/inspect/introspection.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 6361044d42b8..82d88c00b1b8 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -28,6 +28,7 @@ #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <osl/thread.h> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> @@ -1573,11 +1574,11 @@ typedef css::lang::XServiceInfo, css::beans::XIntrospection> Implementation_Base; -class Implementation: private osl::Mutex, public Implementation_Base { +class Implementation: private cppu::BaseMutex, public Implementation_Base { public: explicit Implementation( css::uno::Reference<css::uno::XComponentContext> const & context): - Implementation_Base(*static_cast<Mutex *>(this)), + Implementation_Base(m_aMutex), reflection_(css::reflection::theCoreReflection::get(context)) {} @@ -1618,7 +1619,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect( css::uno::Any const & aObject) throw (css::uno::RuntimeException, std::exception) { - osl::MutexGuard g(this); + osl::MutexGuard g(m_aMutex); if (rBHelper.bDisposed) { throw css::lang::DisposedException( getImplementationName(), static_cast<OWeakObject *>(this)); |