diff options
| author | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-29 20:45:20 +0000 |
|---|---|---|
| committer | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-29 20:45:20 +0000 |
| commit | 09c3a64f52717dfff608307e6d376236478d15a1 (patch) | |
| tree | f85c78e82f3b20273de2677b1ce1a6740da1381b | |
| parent | 417da4047cc700e3a920fbbc19e48d7c04dcc2af (diff) | |
| download | ATCD-09c3a64f52717dfff608307e6d376236478d15a1.tar.gz | |
ChangeLogTag: Mon Nov 29 14:44:16 2004 Dale Wilson <wilson_d@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Admin.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Admin.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventChannel.h | 2 |
5 files changed, 18 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d87a3cc7b2f..a5a15b49fde 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Nov 29 14:44:16 2004 Dale Wilson <wilson_d@ociweb.com> + + * orbsvcs/orbsvcs/Notify/Admin.h: + * orbsvcs/orbsvcs/Notify/Admin.cpp: + * orbsvcs/orbsvcs/Notify/EventChannel.h: + * orbsvcs/orbsvcs/Notify/EventChannel.cpp: + Another instance of the ambiguous init method. + Mon Nov 29 13:23:14 2004 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/orbsvcs/Notify/Admin.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index 0f225a558c5..1ffee04b663 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -40,14 +40,15 @@ TAO_Notify_Admin::~TAO_Notify_Admin () } void -TAO_Notify_Admin::init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL) +TAO_Notify_Admin::init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL) { - this->ec_ = ec; + this->ec_ = dynamic_cast<TAO_Notify_EventChannel *>(parent); + ACE_ASSERT (this->ec_ != 0); this->ec_->_incr_refcnt (); // this-> on the following line confuses VC6 - TAO_Notify::Topology_Parent::init (ec ACE_ENV_ARG_PARAMETER); + TAO_Notify::Topology_Parent::init (parent ACE_ENV_ARG_PARAMETER); ACE_NEW_THROW_EX (this->proxy_container_, TAO_Notify_Proxy_Container (), diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h index ea1029d8cc1..3e67f4303ed 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h @@ -49,7 +49,7 @@ public: ~TAO_Notify_Admin (); /// Init - void init (TAO_Notify_EventChannel *ec ACE_ENV_ARG_DECL); + void init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL); /// Insert the proxy in the <proxy_container_>. void insert (TAO_Notify_Proxy* proxy ACE_ENV_ARG_DECL); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index e5d513e40cf..892de5ecc70 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -127,13 +127,14 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf void -TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf +TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL) { // this-> on the following line confuses VC6 - TAO_Notify::Topology_Parent::init (ecf ACE_ENV_ARG_PARAMETER); + TAO_Notify::Topology_Parent::init (parent ACE_ENV_ARG_PARAMETER); - this->ecf_ = ecf; + this->ecf_ = dynamic_cast <TAO_Notify_EventChannelFactory*>(parent); + ACE_ASSERT (this->ecf_ != 0); this->ecf_->_incr_refcnt (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h index c52843ac570..43dce44913b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h @@ -67,7 +67,7 @@ public: ACE_ENV_ARG_DECL); /// Init (for reload) - void init (TAO_Notify_EventChannelFactory* ecf + void init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL); /// Remove ConsumerAdmin from its container. |