diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify')
9 files changed, 3 insertions, 36 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index 282ef254537..3ca6610b3f5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -130,9 +130,3 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs) } } -void -TAO_Notify_ProxyPushConsumer::init (TAO_Notify_SupplierAdmin *supplier_admin - ACE_ENV_ARG_DECL) -{ - TAO_Notify_ProxyConsumer::init (supplier_admin ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index 4b24ef68bac..ef66f3ec7b9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -57,10 +57,6 @@ public: virtual const char * get_proxy_type_name (void) const; virtual void load_attrs (const TAO_Notify::NVPList& attrs); - // override and hide derived init methods and - // explicitly direct the init call down the correct - // leg of the d**n diamond. - virtual void init (TAO_Notify_SupplierAdmin *supplier_admin ACE_ENV_ARG_DECL); protected: ///= CosNotifyChannelAdmin::ProxyPushConsumer methods diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp index 61c305edb6d..33e2bc9f7f0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp @@ -44,7 +44,7 @@ TAO_Notify_Object::~TAO_Notify_Object () } void -TAO_Notify_Object::init (TAO_Notify_Object* parent) +TAO_Notify_Object::initialize (TAO_Notify_Object* parent) { this->event_manager_ = parent->event_manager_; this->admin_properties_ = parent->admin_properties_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h index 2ff8aa537eb..43bea7ac4d5 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h @@ -124,7 +124,7 @@ public: protected: /// Init this object with data from <rhs>. - void init (TAO_Notify_Object* parent); + void initialize (TAO_Notify_Object* parent); /// Shutdown the current worker task and delete it if we own it. void shutdown_worker_task (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index 9286589fac4..677bfdbe73e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -137,9 +137,3 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att } } -void -TAO_Notify_SequenceProxyPushConsumer::init (TAO_Notify_SupplierAdmin *supplier_admin - ACE_ENV_ARG_DECL) -{ - TAO_Notify_ProxyConsumer::init (supplier_admin ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h index c9eecb7b897..a47e2510576 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h @@ -56,11 +56,6 @@ public: virtual void load_attrs (const TAO_Notify::NVPList& attrs); - // override and hide derived init methods and - // explicitly direct the init call down the correct - // leg of the d**n diamond. - virtual void init (TAO_Notify_SupplierAdmin *supplier_admin ACE_ENV_ARG_DECL); - protected: ///= Data Members TAO_Notify_Property_Time pacing_interval_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index 0abb49dab13..7966c3c2e3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -131,10 +131,3 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a ACE_ENDTRY; } } - -void -TAO_Notify_StructuredProxyPushConsumer::init (TAO_Notify_SupplierAdmin *supplier_admin - ACE_ENV_ARG_DECL) -{ - TAO_Notify_ProxyConsumer::init (supplier_admin ACE_ENV_ARG_PARAMETER); -} diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h index 1ea07ac3bce..35fc44fe559 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h @@ -55,11 +55,6 @@ public: virtual void load_attrs (const TAO_Notify::NVPList& attrs); - // override and hide derived init methods and - // explicitly direct the init call down the correct - // leg of the d**n diamond. - virtual void init (TAO_Notify_SupplierAdmin *supplier_admin ACE_ENV_ARG_DECL); - protected: // = interface methods diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp index bbd79d631bb..a810f0a2954 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp @@ -36,7 +36,7 @@ namespace TAO_Notify Topology_Object::init (Topology_Parent * parent) { this->topology_parent_ = parent; - TAO_Notify_Object::init (parent); + TAO_Notify_Object::initialize (parent); } Topology_Parent * |