diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-14 13:15:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-14 14:41:54 +0200 |
| commit | 11fd73acce5d8bff7025bb6ddcbaf99d9d70b545 (patch) | |
| tree | 1a3d4dbe24e4bbbf301eca3a277e211483b3312a /framework/source | |
| parent | a883783c2a1b0e7a8ee5b46387d1e1e3bc5e19bd (diff) | |
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
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/fwi/threadhelp/lockhelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 3b4d7286b710..d32fafb170e2 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -44,7 +44,7 @@ namespace framework{ @onerror - *//*-*************************************************************************************************************/ -LockHelper::LockHelper( ::osl::SolarMutex* pSolarMutex ) +LockHelper::LockHelper( comphelper::SolarMutex* pSolarMutex ) : m_pFairRWLock ( NULL ) , m_pOwnMutex ( NULL ) , m_pSolarMutex ( NULL ) @@ -400,7 +400,7 @@ void LockHelper::downgradeWriteAccess() @onerror No error should occure. *//*-*************************************************************************************************************/ -LockHelper& LockHelper::getGlobalLock( ::osl::SolarMutex* pSolarMutex ) +LockHelper& LockHelper::getGlobalLock( comphelper::SolarMutex* pSolarMutex ) { // Initialize static "member" only for one time! // Algorithm: |