Use true/false instead of 1/0 for connected checks

    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:

10 files changed, 43 insertions, 47 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 63b3407fecf..522f8e5506b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -11,8 +11,6 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CEC_EventChannel::
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
index 50fe4fd1094..6eef61ef41a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -1,8 +1,6 @@
 #include "orbsvcs/CosEvent/CEC_Factory.h"
 #include "ace/Dynamic_Service.h"
 
-
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_CEC_Factory::~TAO_CEC_Factory (void)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 625fade23c1..a12bdf9b683 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -89,7 +89,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
             CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       return 0; // ACE_THROW (CosEventComm::Disconnected ());????
 
     supplier =
@@ -135,7 +135,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier ()
             CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       return 0; // ACE_THROW (CosEventComm::Disconnected ());????
 
     supplier =
@@ -168,15 +168,15 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
 
-    disconnected = 0;
-    if (this->is_connected_i () == 0)
+    disconnected = false;
+    if (!this->is_connected_i ())
       {
-        disconnected = 1;
-        return 0;
+        disconnected = true;
+        return false;
       }
     if (CORBA::is_nil (this->nopolicy_supplier_.in ()))
       {
-        return 0;
+        return false;
       }
     supplier = CORBA::Object::_duplicate (this->nopolicy_supplier_.in ());
   }
@@ -184,7 +184,7 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent (
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   return supplier->_non_existent ();
 #else
-  return 0;
+  return false;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
@@ -332,7 +332,7 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer ()
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       throw CORBA::BAD_INV_ORDER (); // @@ add user exception?
 
     supplier = this->supplier_._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
index 67bb6e354ef..d0a626e9b03 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
@@ -10,7 +10,7 @@ TAO_CEC_ProxyPullConsumer::is_connected_i (void) const
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPullConsumer::is_connected (void) const
 {
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false);
 
   return this->is_connected_i ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 305920b65ee..db840f03ee5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -113,15 +113,15 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
 
-    disconnected = 0;
-    if (this->is_connected_i () == 0)
+    disconnected = false;
+    if (!this->is_connected_i ())
       {
-        disconnected = 1;
-        return 0;
+        disconnected = true;
+        return false;
       }
     if (CORBA::is_nil (this->nopolicy_consumer_.in ()))
       {
-        return 0;
+        return false;
       }
     consumer = CORBA::Object::_duplicate (this->nopolicy_consumer_.in ());
   }
@@ -129,7 +129,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   return consumer->_non_existent ();
 #else
-  return 0;
+  return false;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
@@ -300,7 +300,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier ()
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       throw CORBA::BAD_INV_ORDER ();
 
     consumer = this->consumer_._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
index 96c4591583e..9101a57bc0b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
@@ -10,7 +10,7 @@ TAO_CEC_ProxyPullSupplier::is_connected_i (void) const
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPullSupplier::is_connected (void) const
 {
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false);
 
   return this->is_connected_i ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
index 0f865f9b440..d93fc640172 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
@@ -10,7 +10,7 @@ TAO_CEC_ProxyPushConsumer::is_connected_i (void) const
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPushConsumer::is_connected (void) const
 {
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false);
 
   return this->is_connected_i ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index f8891b2e576..b1a1569031a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -207,7 +207,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event)
   {
     ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       return;
 
     TAO_ESF_RefCount_Guard<CORBA::ULong> cnt_mon (this->refcount_);
@@ -235,7 +235,7 @@ TAO_CEC_ProxyPushSupplier::invoke (const TAO_CEC_TypedEvent& typed_event)
 
     ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       return;
 
     TAO_ESF_RefCount_Guard<CORBA::ULong> cnt_mon (this->refcount_);
@@ -261,7 +261,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event)
   {
     ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       return;
 
     TAO_ESF_RefCount_Guard<CORBA::ULong> cnt_mon (this->refcount_);
@@ -518,7 +518,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier ()
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       throw CORBA::BAD_INV_ORDER ();
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -603,7 +603,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event)
             CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       return; // ACE_THROW (CosEventComm::Disconnected ());????
 
     consumer =
@@ -640,7 +640,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
   CosEventComm::PushConsumer_var consumer;
   {
     ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       return; // TAO_THROW (CosEventComm::Disconnected ());????
 
     consumer =
@@ -697,7 +697,7 @@ TAO_CEC_ProxyPushSupplier::invoke_to_consumer (const TAO_CEC_TypedEvent &typed_e
             CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       return; // ACE_THROW (CosEventComm::Disconnected ());????
 
     typed_consumer_obj =
@@ -765,7 +765,7 @@ TAO_CEC_ProxyPushSupplier::reactive_invoke_to_consumer (
 
   {
     ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
     {
       return; // TAO_THROW (CosEventComm::Disconnected ());????
     }
@@ -838,11 +838,11 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
 
-    disconnected = 0;
-    if (this->is_connected_i () == 0)
+    disconnected = false;
+    if (!this->is_connected_i ())
       {
-        disconnected = 1;
-        return 0;
+        disconnected = true;
+        return false;
       }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -850,7 +850,7 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
       {
         if (CORBA::is_nil (this->nopolicy_typed_consumer_.in ()))
           {
-            return 0;
+            return false;
           }
         consumer = CORBA::Object::_duplicate
           (this->nopolicy_typed_consumer_.in ());
@@ -860,7 +860,7 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
     if (CORBA::is_nil (this->nopolicy_consumer_.in ()))
       {
-        return 0;
+        return false;
       }
     consumer = CORBA::Object::_duplicate (this->nopolicy_consumer_.in ());
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -871,7 +871,7 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   return consumer->_non_existent ();
 #else
-  return 0;
+  return false;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
index 79be8659d44..995109cfb53 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
@@ -21,7 +21,7 @@ TAO_CEC_ProxyPushSupplier::is_connected_i (void) const
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPushSupplier::is_connected (void) const
 {
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
+  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, false);
 
   return this->is_connected_i ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index 74b83b68e39..93b02abfe2f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -115,15 +115,15 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent (
         ACE_Lock, ace_mon, *this->lock_,
         CORBA::INTERNAL ());
 
-    disconnected = 0;
-    if (this->is_connected_i () == 0)
+    disconnected = false;
+    if (!this->is_connected_i ())
       {
-        disconnected = 1;
-        return 0;
+        disconnected = true;
+        return false;
       }
     if (CORBA::is_nil (this->nopolicy_typed_supplier_.in ()))
       {
-        return 0;
+        return false;
       }
     supplier = CORBA::Object::_duplicate
       (this->nopolicy_typed_supplier_.in ());
@@ -132,7 +132,7 @@ TAO_CEC_TypedProxyPushConsumer::supplier_non_existent (
 #if (TAO_HAS_MINIMUM_CORBA == 0)
   return supplier->_non_existent ();
 #else
-  return 0;
+  return false;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
@@ -284,7 +284,7 @@ TAO_CEC_TypedProxyPushConsumer::disconnect_push_consumer ()
         CORBA::INTERNAL ());
     // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    if (this->is_connected_i () == 0)
+    if (!this->is_connected_i ())
       throw CORBA::BAD_INV_ORDER (); // @@ add user exception?
 
     supplier = this->typed_supplier_._retn ();
@@ -374,7 +374,7 @@ TAO_CEC_TypedProxyPushConsumer_Guard::
   // @@ Returning something won't work either, the error should be
   // logged though!
 
-  if (proxy->is_connected_i () == 0)
+  if (!proxy->is_connected_i ())
     return;
 
   this->locked_ = 1;