summaryrefslogtreecommitdiffstats
path: root/include/osl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-05-14 13:15:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-05-14 14:41:54 +0200
commit11fd73acce5d8bff7025bb6ddcbaf99d9d70b545 (patch)
tree1a3d4dbe24e4bbbf301eca3a277e211483b3312a /include/osl
parentresolved fdo#60468 no special tab case workaround for CSV import (diff)
downloadcore-11fd73acce5d8bff7025bb6ddcbaf99d9d70b545.tar.gz
core-11fd73acce5d8bff7025bb6ddcbaf99d9d70b545.zip
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/osl')
-rw-r--r--include/osl/mutex.hxx26
1 files changed, 0 insertions, 26 deletions
diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index 18ff44444223..9fab63fb27c3 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -238,32 +238,6 @@ namespace osl
typedef Guard<Mutex> MutexGuard;
typedef ClearableGuard<Mutex> ClearableMutexGuard;
typedef ResettableGuard< Mutex > ResettableMutexGuard;
-
- /** SolarMutex interface, needed for SolarMutex.
- Deprecated, used just for Application::GetSolarMutex().
- */
- class SolarMutex
- {
- public:
- /** Blocks if mutex is already in use
- */
- virtual void SAL_CALL acquire() = 0;
-
- /** Tries to get the mutex without blocking.
- */
- virtual sal_Bool SAL_CALL tryToAcquire() = 0;
-
- /** Releases the mutex.
- */
- virtual void SAL_CALL release() = 0;
-
- protected:
- SolarMutex() {}
- virtual ~SolarMutex() {}
- };
- typedef osl::Guard< SolarMutex > SolarGuard;
- typedef osl::ClearableGuard< SolarMutex > ClearableSolarGuard;
- typedef osl::ResettableGuard< SolarMutex > ResettableSolarGuard;
}
#endif /* __cplusplus */