diff options
| author | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-03 17:39:44 +0000 |
|---|---|---|
| committer | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-03 17:39:44 +0000 |
| commit | cc40a2cbb73db0ef7ef4921d77f9bed5ca64ef71 (patch) | |
| tree | 6611a0b8571787071bd6a8d6f87af99ceba9d0f4 /TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp | |
| parent | d878af54476a4a47db8f5d1a3bf02cbc72008f60 (diff) | |
| download | ATCD-cc40a2cbb73db0ef7ef4921d77f9bed5ca64ef71.tar.gz | |
ChangeLogTag: Fri Dec 3 11:34:37 2004 Dale Wilson <wilson_d@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 52894595d8d..bafe725b673 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -26,9 +26,6 @@ # define DEBUG_LEVEL TAO_debug_level #endif //DEBUG_LEVEL -// for VC6. Otherwise calling Tao_Notify::TopologyObject::init confuses the parser -using namespace TAO_Notify; - ACE_RCSID(Notify, TAO_Notify_EventChannel, "$Id$") typedef TAO_Notify_Find_Worker_T<TAO_Notify_ConsumerAdmin @@ -60,16 +57,13 @@ TAO_Notify_EventChannel::~TAO_Notify_EventChannel () this->ecf_->_decr_refcnt (); } -// for VC6. Otherwise calling Tao_Notify::TopologyObject::init confuses the parser -typedef TAO_Notify::Topology_Object TAO_Notify_Topology_Object; - void TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf , const CosNotification::QoSProperties & initial_qos , const CosNotification::AdminProperties & initial_admin ACE_ENV_ARG_DECL) { - TAO_Notify_Topology_Object::init (ecf ACE_ENV_ARG_PARAMETER); + set_parent (ecf ACE_ENV_ARG_PARAMETER); this->ecf_ = ecf; @@ -132,13 +126,10 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf void -TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent * parent +TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory * ecf ACE_ENV_ARG_DECL) { - Topology_Object::init (parent ACE_ENV_ARG_PARAMETER); - - this->ecf_ = dynamic_cast <TAO_Notify_EventChannelFactory*>(parent); - ACE_ASSERT (this->ecf_ != 0); + Topology_Object::set_parent (ecf ACE_ENV_ARG_PARAMETER); this->ecf_->_incr_refcnt (); |