From 81cb6a7fbc315d3287e7a485b73a1b66dd4478ef Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 10 Jan 2014 11:14:44 +0100
Subject: [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
---
 cppu/source/AffineBridge/AffineBridge.cxx                 | 6 +++---
 cppu/source/LogBridge/LogBridge.cxx                       | 6 +++---
 cppu/source/UnsafeBridge/UnsafeBridge.cxx                 | 6 +++---
 cppu/source/helper/purpenv/helper_purpenv_Environment.cxx | 4 ++--
 cppuhelper/test/bootstrap/TestEnv.cxx                     | 6 +++---
 include/cppu/Enterable.hxx                                | 2 +-
 6 files changed, 15 insertions(+), 15 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);
 }
diff --git a/cppuhelper/test/bootstrap/TestEnv.cxx b/cppuhelper/test/bootstrap/TestEnv.cxx
index 1a0d4065ea2c..2ea3594257ec 100644
--- a/cppuhelper/test/bootstrap/TestEnv.cxx
+++ b/cppuhelper/test/bootstrap/TestEnv.cxx
@@ -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");
diff --git a/include/cppu/Enterable.hxx b/include/cppu/Enterable.hxx
index 778d5ac75182..50894dfb54f5 100644
--- a/include/cppu/Enterable.hxx
+++ b/include/cppu/Enterable.hxx
@@ -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() {}
 
-- 
cgit