summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-10 11:14:44 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-10 17:11:43 +0100
commit81cb6a7fbc315d3287e7a485b73a1b66dd4478ef (patch)
treed25c4a3e8356f41b6e41b043d7e3511b04635b14 /cppu
parent8471b35688d82181e8cd68095fb98d16d3cd7784 (diff)
[API CHANGE] cppu::Enterable::v_isValid returns bool
While strictly speaking an incompatible change, it is extremely unlikely that external code uses cppu::Enterable at all; this should always have been a private URE implementation detail. Change-Id: I2c3fe754fe6268b18ca03532229f3403736f6f6e
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/AffineBridge/AffineBridge.cxx6
-rw-r--r--cppu/source/LogBridge/LogBridge.cxx6
-rw-r--r--cppu/source/UnsafeBridge/UnsafeBridge.cxx6
-rw-r--r--cppu/source/helper/purpenv/helper_purpenv_Environment.cxx4
4 files changed, 11 insertions, 11 deletions
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 5a23ae212d0d..289fd9a837bd 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -75,7 +75,7 @@ public:
virtual void v_enter(void);
virtual void v_leave(void);
- virtual int v_isValid(rtl::OUString * pReason);
+ virtual bool v_isValid(rtl::OUString * pReason);
void innerDispatch(void);
void outerDispatch(int loop);
@@ -317,9 +317,9 @@ void AffineBridge::v_leave(void)
m_innerMutex.release();
}
-int AffineBridge::v_isValid(rtl::OUString * pReason)
+bool AffineBridge::v_isValid(rtl::OUString * pReason)
{
- int result = m_enterCount > 0;
+ bool result = m_enterCount > 0;
if (!result)
*pReason = rtl::OUString("not entered");
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index f6be81dec24d..0de1ee5e6fd5 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -50,7 +50,7 @@ public:
virtual void v_enter(void);
virtual void v_leave(void);
- virtual int v_isValid(rtl::OUString * pReason);
+ virtual bool v_isValid(rtl::OUString * pReason);
};
LogBridge::LogBridge(void)
@@ -107,9 +107,9 @@ void LogBridge::v_leave(void)
m_mutex.release();
}
-int LogBridge::v_isValid(rtl::OUString * pReason)
+bool LogBridge::v_isValid(rtl::OUString * pReason)
{
- int result = m_count > 0;
+ bool result = m_count > 0;
if (!result)
{
*pReason = rtl::OUString("not entered");
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 511969116dbb..d653a1a2a9a8 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -57,7 +57,7 @@ public:
virtual void v_enter(void);
virtual void v_leave(void);
- virtual int v_isValid(rtl::OUString * pReason);
+ virtual bool v_isValid(rtl::OUString * pReason);
};
UnsafeBridge::UnsafeBridge(void)
@@ -117,9 +117,9 @@ void UnsafeBridge::v_leave(void)
m_mutex.release();
}
-int UnsafeBridge::v_isValid(rtl::OUString * pReason)
+bool UnsafeBridge::v_isValid(rtl::OUString * pReason)
{
- int result = m_count > 0;
+ bool result = m_count > 0;
if (!result)
{
*pReason = rtl::OUString("not entered");
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 15946d7558de..48d5dabe899b 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -103,7 +103,7 @@ public:
virtual void v_leave (void);
virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam);
virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam);
- virtual int v_isValid (rtl::OUString * pReason);
+ virtual bool v_isValid (rtl::OUString * pReason);
protected:
oslInterlockedCount m_nRef;
@@ -512,7 +512,7 @@ void Base::v_callOut_v(uno_EnvCallee * pCallee, va_list * pParam)
m_pEnterable->callOut_v(pCallee, pParam);
}
-int Base::v_isValid(rtl::OUString * pReason)
+bool Base::v_isValid(rtl::OUString * pReason)
{
return m_pEnterable->isValid(pReason);
}