strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[API CHANGE] cppu::Enterable::v_isValid returns bool

Browse source 
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
This commit is contained in:
Stephan Bergmann 2014-01-10 11:14:44 +01:00
parent 8471b35688
commit 81cb6a7fbc
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cppu/source/AffineBridge/AffineBridge.cxx
View file

@ -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");

6
cppu/source/LogBridge/LogBridge.cxx
View file

@ -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");

6
cppu/source/UnsafeBridge/UnsafeBridge.cxx
View file

@ -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");

4
cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
View file

@ -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);
}

6
cppuhelper/test/bootstrap/TestEnv.cxx
View file

@ -52,7 +52,7 @@ protected:
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);
};
TestEnv::TestEnv()
@ -91,9 +91,9 @@ void TestEnv::v_leave(void)
-- m_inCount;
}
int TestEnv::v_isValid(rtl::OUString * pReason)
bool TestEnv::v_isValid(rtl::OUString * pReason)
{
int result = m_inCount & 1;
bool result = m_inCount & 1;
if (result)
*pReason = rtl::OUString("OK");

2
include/cppu/Enterable.hxx
View file

@ -40,7 +40,7 @@ public:
virtual void v_leave (void) = 0;
virtual void v_callInto_v(uno_EnvCallee * pCallee, va_list * pParam) = 0;
virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) = 0;
virtual int v_isValid (rtl::OUString * pReason) = 0;
virtual bool v_isValid (rtl::OUString * pReason) = 0;
virtual ~Enterable() {}