ChangeLogTag: Tue Dec 14 13:50:14 2004 Chad Elliott <elliott_c@ociweb.com>

10 files changed, 29 insertions, 21 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 889a1fab24f..acad575aa0e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -40,12 +40,16 @@ 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)
 {
-  set_parent (ec ACE_ENV_ARG_PARAMETER);
+  this->ec_ = dynamic_cast<TAO_Notify_EventChannel *>(parent);
+  ACE_ASSERT (this->ec_ != 0);
 
   this->ec_->_incr_refcnt ();
 
+  // this-> on the following line confuses VC6
+  initialize (parent ACE_ENV_ARG_PARAMETER);
+
   ACE_NEW_THROW_EX (this->proxy_container_,
                     TAO_Notify_Proxy_Container (),
                     CORBA::INTERNAL ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.h b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
index df4678b0503..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 00b67c7d542..299617258aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -43,8 +43,6 @@ TAO_Notify_SupplierAdmin_Find_Worker;
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_ConsumerAdmin> TAO_Notify_ConsumerAdmin_Seq_Worker;
 typedef TAO_Notify_Seq_Worker_T<TAO_Notify_SupplierAdmin> TAO_Notify_SupplierAdmin_Seq_Worker;
 
-using namespace TAO_Notify;
-
 TAO_Notify_EventChannel::TAO_Notify_EventChannel (void)
   : ecf_ (0)
   , ca_container_ (0)
@@ -65,7 +63,8 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
                            , const CosNotification::AdminProperties & initial_admin
                            ACE_ENV_ARG_DECL)
 {
-  set_parent (ecf ACE_ENV_ARG_PARAMETER);
+  // this-> on the following line confuses VC6
+  initialize (ecf ACE_ENV_ARG_PARAMETER);
 
   this->ecf_ = ecf;
 
@@ -128,10 +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)
 {
-  Topology_Object::set_parent (ecf ACE_ENV_ARG_PARAMETER);
+  // this-> on the following line confuses VC6
+  initialize (parent ACE_ENV_ARG_PARAMETER);
+
+  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.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index 5193222c9d7..3c0457cf5f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -44,11 +44,12 @@ TAO_Notify_ProxyConsumer::peer (void)
 }
 
 void
-TAO_Notify_ProxyConsumer::init (TAO_Notify_SupplierAdmin * supplier_admin ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL)
 {
-  set_parent (supplier_admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Proxy::initialize (topology_parent ACE_ENV_ARG_PARAMETER);
 
-  this->supplier_admin_ = supplier_admin;
+  this->supplier_admin_ = dynamic_cast<TAO_Notify_SupplierAdmin *>(topology_parent);
+  ACE_ASSERT(this->supplier_admin_ != 0);
 
   this->supplier_admin_->_incr_refcnt ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index bdfeee329c7..862ffcddedd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -47,8 +47,8 @@ public:
   /// Destructor
   ~TAO_Notify_ProxyConsumer ();
 
-  /// Initialize with pointer to parent
-  void init (TAO_Notify_SupplierAdmin * supplier_admin ACE_ENV_ARG_DECL);
+  /// init: overrides Topology_Object method
+  virtual void init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
 
   /// Connect
   void connect (TAO_Notify_Supplier* supplier ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 5e606852504..2b87323ca46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -29,9 +29,9 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier ()
 }
 
 void
-TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin * consumer_admin ACE_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
 {
-  set_parent (consumer_admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER);
 
   this->consumer_admin_ = consumer_admin;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 6a186c0af0c..a099204f539 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -45,7 +45,7 @@ public:
   virtual ~TAO_Notify_ProxySupplier ();
 
   /// Init
-  void init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
+  virtual void init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL);
 
   /// Connect
   void connect (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index fc4cc158894..46afcb3bc62 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -33,10 +33,10 @@ namespace TAO_Notify
   }
 
   void
-  Topology_Object::set_parent (Topology_Parent * topology_parent ACE_ENV_ARG_DECL_NOT_USED)
+  Topology_Object::initialize (Topology_Parent * topology_parent ACE_ENV_ARG_DECL_NOT_USED)
   {
     this->topology_parent_ = topology_parent;
-    initialize (topology_parent);
+    TAO_Notify_Object::initialize (topology_parent);
   }
 
   Topology_Parent *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index d2727f05e70..dd4082ff4d3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -103,8 +103,8 @@ namespace TAO_Notify
     /// The destructor.
     virtual ~Topology_Object ();
 
-    /// set this objects parent and initialize _Object
-    void set_parent(Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
+    /// Init this object with data from <rhs>.
+    virtual void initialize (Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
 
     /// \brief Create a child of the appropriate type and return it.
     ///