diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-04 08:55:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-04 08:55:12 +0000 |
| commit | efa3cae323b347a2aa2a55823f8ff6bc068d3367 (patch) | |
| tree | 895ae46c3a981a6a44e800f560ac08464b111aa9 /TAO/orbsvcs/orbsvcs/Event | |
| parent | d21047dce23792c86471363e6053b9209986b311 (diff) | |
| download | ATCD-efa3cae323b347a2aa2a55823f8ff6bc068d3367.tar.gz | |
ChangeLogTag: Mon Jul 4 08:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event')
7 files changed, 5 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h index 743b0907022..847b38a7208 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h @@ -27,8 +27,7 @@ * initialized in the same fasion. */ class TAO_RTEvent_Serv_Export TAO_ECG_Address_Server_Base : - public virtual POA_RtecUDPAdmin::AddrServer, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecUDPAdmin::AddrServer { public: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h index 956d89a1310..f74b4a8c969 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h @@ -45,8 +45,7 @@ * */ class TAO_RTEvent_Serv_Export TAO_ECG_Complex_Address_Server : - public virtual POA_RtecUDPAdmin::AddrServer, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecUDPAdmin::AddrServer { public: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index ed8dd5c3707..19bebc66dc6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -107,7 +107,6 @@ private: */ class Observer : public virtual POA_RtecEventChannelAdmin::Observer, - public virtual PortableServer::RefCountServantBase, public TAO_EC_Deactivated_Object { public: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h index bfa6600398d..fa9c83fcbf7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h @@ -25,8 +25,7 @@ * initialized with, regardless of the header. */ class TAO_RTEvent_Serv_Export TAO_ECG_Simple_Address_Server : - public virtual POA_RtecUDPAdmin::AddrServer, - public virtual PortableServer::RefCountServantBase + public virtual POA_RtecUDPAdmin::AddrServer { public: diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h index 15ee75ab745..e5de7f78b19 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h @@ -94,9 +94,8 @@ private: * This class connects as a supplier to an EventChannel, and supplies * to it all events it receives via UDP or Multicast. */ -class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver - : public virtual PortableServer::RefCountServantBase - , public virtual POA_RtecEventComm::PushSupplier +class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Receiver : + public virtual POA_RtecEventComm::PushSupplier , public virtual TAO_EC_Deactivated_Object , public virtual TAO_ECG_Dgram_Handler { diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 6c0d3caa02b..0f631502117 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -95,7 +95,6 @@ private: * */ class TAO_RTEvent_Serv_Export TAO_ECG_UDP_Sender : - public virtual PortableServer::RefCountServantBase, public virtual POA_RtecEventComm::PushConsumer, public TAO_EC_Deactivated_Object { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h index 9fabba95d48..39b168a4c85 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h @@ -106,7 +106,6 @@ private: */ class TAO_RTEvent_Serv_Export TAO_EC_Event_Channel_Base : public POA_RtecEventChannelAdmin::EventChannel - , public PortableServer::RefCountServantBase { public: /// destructor |