Fixed compile errors due to rename in the base, make clear that ec has its own refcount

    * TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
    * TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
    * TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp:
    * TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp:
    * TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp:

5 files changed, 12 insertions, 20 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 8260288b13d..9ca4c7a410a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -16,7 +16,7 @@ typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
 TAO_EC_ProxyPushConsumer::
     TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel_Base* ec)
   : event_channel_ (ec),
-    refcount_ (1),
+    ec_refcount_ (1),
     connected_ (false),
     filter_ (0)
 {
@@ -70,7 +70,7 @@ void
 TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
-                                          this->refcount_,
+                                          this->ec_refcount_,
                                           this->event_channel_,
                                           this);
   if (!ace_mon.locked ())
@@ -83,7 +83,7 @@ void
 TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
-                                          this->refcount_,
+                                          this->ec_refcount_,
                                           this->event_channel_,
                                           this);
   if (!ace_mon.locked ())
@@ -96,7 +96,7 @@ void
 TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
-                                          this->refcount_,
+                                          this->ec_refcount_,
                                           this->event_channel_,
                                           this);
   if (!ace_mon.locked ())
@@ -201,7 +201,7 @@ CORBA::ULong
 TAO_EC_ProxyPushConsumer::_incr_refcnt (void)
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-  return this->refcount_++;
+  return this->ec_refcount_++;
 }
 
 void
@@ -216,9 +216,9 @@ TAO_EC_ProxyPushConsumer::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
+    this->ec_refcount_--;
+    if (this->ec_refcount_ != 0)
+      return this->ec_refcount_;
   }
 
   this->refcount_zero_hook ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 7c2921475bc..c6ec73de326 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -141,7 +141,7 @@ protected:
   ACE_Lock* lock_;
 
   /// The reference count.
-  CORBA::ULong refcount_;
+  CORBA::ULong ec_refcount_;
 
   /// The supplier....
   RtecEventComm::PushSupplier_var supplier_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
index 0668ec73009..b6603da5c79 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
@@ -1,6 +1,5 @@
 #include "orbsvcs/Event/EC_TPC_Dispatching_Task.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
index cb1164d14a3..0b60d49d1cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -1,8 +1,5 @@
 #include "orbsvcs/Log_Macros.h"
 #include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
-
-
-
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_TPC_Dispatching.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index e234f48dcab..a45da4bd065 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -5,8 +5,6 @@
 #include "orbsvcs/Event/EC_TPC_ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-
-
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_TPC_Dispatching.h"
 
@@ -16,16 +14,14 @@ extern unsigned long TAO_EC_TPC_debug_level;
 
 TAO_EC_TPC_ProxyPushSupplier::~TAO_EC_TPC_ProxyPushSupplier (void)
 {
-
 }
 
 void
 TAO_EC_TPC_ProxyPushSupplier:: disconnect_push_supplier (void)
 {
   if (TAO_EC_TPC_debug_level > 0)
-    ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): refcount=%u,consumer=%@\n",
+    ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): enter EC_TPC_ProxySupplier::disconnect_push_supplier (%@): consumer=%@\n",
                 this,
-                this->refcount_,
                 this->consumer_.in()));
 
   if (this->is_connected_i ())
@@ -54,8 +50,8 @@ TAO_EC_TPC_ProxyPushSupplier::connect_push_consumer (
   BASECLASS::connect_push_consumer (push_consumer, qos);
 
   if (TAO_EC_TPC_debug_level > 0)
-    ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): refcount=%u,consumer=%@\n",
-              this, this->refcount_, this->consumer_.in()));
+    ORBSVCS_DEBUG ((LM_DEBUG, "EC (%P|%t): EC_ProxySupplier(%@): consumer=%@\n",
+              this, this->consumer_.in()));
 
   TAO_EC_TPC_Dispatching* tpcdispatcher = this->tpc_dispatching ();