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 /include/vcl/svapp.hxx | |
| 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 'include/vcl/svapp.hxx')
| -rw-r--r-- | include/vcl/svapp.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index f2f59c25d85b..ffe228e453d5 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -26,8 +26,8 @@ #include <stdexcept> +#include <comphelper/solarmutex.hxx> #include <osl/thread.hxx> -#include <osl/mutex.hxx> #include <tools/string.hxx> #include <tools/link.hxx> #include <tools/solar.h> @@ -165,7 +165,7 @@ public: static void Reschedule( bool bAllEvents = false ); static void Yield( bool bAllEvents = false ); static void EndYield(); - static osl::SolarMutex& GetSolarMutex(); + static comphelper::SolarMutex& GetSolarMutex(); static oslThreadIdentifier GetMainThreadIdentifier(); static sal_uLong ReleaseSolarMutex(); static void AcquireSolarMutex( sal_uLong nCount ); @@ -397,7 +397,7 @@ class VCL_DLLPUBLIC SolarMutexGuard private: SolarMutexGuard( const SolarMutexGuard& ); const SolarMutexGuard& operator = ( const SolarMutexGuard& ); - ::osl::SolarMutex& m_solarMutex; + comphelper::SolarMutex& m_solarMutex; public: @@ -450,7 +450,7 @@ public: } } protected: - osl::SolarMutex& m_solarMutex; + comphelper::SolarMutex& m_solarMutex; }; class VCL_DLLPUBLIC SolarMutexResettableGuard @@ -496,7 +496,7 @@ public: } } protected: - osl::SolarMutex& m_solarMutex; + comphelper::SolarMutex& m_solarMutex; }; |