diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-16 03:20:00 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:38 -0500 |
| commit | d88b292704957818eff9a348a524b5c90b40031b (patch) | |
| tree | eabf039491304b2c13f3bd77ca0b6d58c3dba1b8 /vcl/unx/headless | |
| parent | 98b2c08dff4d00b3e7a2e001c326ebe27dae4549 (diff) | |
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
Diffstat (limited to 'vcl/unx/headless')
| -rw-r--r-- | vcl/unx/headless/svpinst.cxx | 9 | ||||
| -rw-r--r-- | vcl/unx/headless/svpinst.hxx | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx index a9b862bab609..10faf81434ba 100644 --- a/vcl/unx/headless/svpinst.cxx +++ b/vcl/unx/headless/svpinst.cxx @@ -41,6 +41,7 @@ #include <vcl/svdata.hxx> #include <vcl/salatype.hxx> #include <vcl/saldatabasic.hxx> +#include <vcl/solarmutex.hxx> #include <sal/types.h> // plugin factory function @@ -295,7 +296,7 @@ SalBitmap* SvpSalInstance::CreateSalBitmap() return new SvpSalBitmap(); } -vos::IMutex* SvpSalInstance::GetYieldMutex() +osl::SolarMutex* SvpSalInstance::GetYieldMutex() { return &m_aYieldMutex; } @@ -464,7 +465,7 @@ SvpSalYieldMutex::SvpSalYieldMutex() void SvpSalYieldMutex::acquire() { - OMutex::acquire(); + SolarMutexObject::acquire(); mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; } @@ -477,12 +478,12 @@ void SvpSalYieldMutex::release() mnThreadId = 0; mnCount--; } - OMutex::release(); + SolarMutexObject::release(); } sal_Bool SvpSalYieldMutex::tryToAcquire() { - if ( OMutex::tryToAcquire() ) + if ( SolarMutexObject::tryToAcquire() ) { mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx index 198cc9cb613c..ace3ac7c236c 100644 --- a/vcl/unx/headless/svpinst.hxx +++ b/vcl/unx/headless/svpinst.hxx @@ -32,7 +32,9 @@ #include <vcl/salinst.hxx> #include <vcl/salwtype.hxx> #include <vcl/saltimer.hxx> -#include <vos/mutex.hxx> +#include <vcl/solarmutex.hxx> + +#include <osl/mutex.hxx> #include <osl/thread.hxx> #include <list> @@ -47,7 +49,7 @@ // SalYieldMutex // ------------------------------------------------------------------------- -class SvpSalYieldMutex : public NAMESPACE_VOS(OMutex) +class SvpSalYieldMutex : public ::vcl::SolarMutexObject { protected: ULONG mnCount; @@ -174,7 +176,7 @@ public: virtual SalBitmap* CreateSalBitmap(); // YieldMutex - virtual vos::IMutex* GetYieldMutex(); + virtual osl::SolarMutex* GetYieldMutex(); virtual ULONG ReleaseYieldMutex(); virtual void AcquireYieldMutex( ULONG nCount ); |