summaryrefslogtreecommitdiffstats
path: root/include/tools
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/tools
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/tools')
-rw-r--r--include/tools/solarmutex.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/tools/solarmutex.hxx b/include/tools/solarmutex.hxx
index 1d6b13c59655..cf4b156a51cf 100644
--- a/include/tools/solarmutex.hxx
+++ b/include/tools/solarmutex.hxx
@@ -20,14 +20,14 @@
#define _TOOLS_SOLARMUTEX_HXX
#include "tools/toolsdllapi.h"
-#include <osl/mutex.hxx>
+#include <comphelper/solarmutex.hxx>
namespace tools
{
class TOOLS_DLLPUBLIC SolarMutex
{
public:
- static void SetSolarMutex( ::osl::SolarMutex* pMutex );
+ static void SetSolarMutex( comphelper::SolarMutex* pMutex );
static bool Acquire();
static void Release();
};