From 11fd73acce5d8bff7025bb6ddcbaf99d9d70b545 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 14 May 2013 13:15:38 +0200 Subject: SolarMutex does not belong into the URE interface ...so move it from osl/mutex.hxx to its own comphelper/solarmutex.hxx. It looks like a newbie mistake that 59e7685d8d812ee8773f57475cbe3aa2a0bdfc81 "Create an abstract interface to be used to implement a SolarMutex" put it here in the first place. I do not consider this an incompatible change really, as no external URE client code should have used SolarMutex anyway. (Also included some clean up, like removing unused {Clearable,Resettable}SolarGuard, and spelling out SolarGuard in the few places it is used.) Change-Id: I121ffb5b7cefbc19e88b5405e5a85ffc895be852 --- vcl/inc/generic/geninst.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/inc/generic') diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h index de47409e4fff..acbe1d49e2fb 100644 --- a/vcl/inc/generic/geninst.h +++ b/vcl/inc/generic/geninst.h @@ -58,7 +58,7 @@ public: virtual void acquire(); virtual void release(); - virtual sal_Bool tryToAcquire(); + virtual bool tryToAcquire(); virtual sal_uIntPtr GetAcquireCount() const { return mnCount; } oslThreadIdentifier GetThreadId() const { return mnThreadId; } @@ -81,7 +81,7 @@ public: virtual ~SalGenericInstance(); // Yield mutex - virtual osl::SolarMutex* GetYieldMutex(); + virtual comphelper::SolarMutex* GetYieldMutex(); virtual sal_uIntPtr ReleaseYieldMutex(); virtual void AcquireYieldMutex( sal_uIntPtr nCount ); virtual bool CheckYieldMutex(); -- cgit