ChangeLogTag: Thu Feb 27 09:09:44 2003 Pradeep Gore <pradeep@oomworks.com>

1 files changed, 14 insertions, 37 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index 3004d23da45..ad43477e2da 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -17,64 +17,40 @@
 
 ACE_RCSID(RT_Notify, TAO_NS_Container_T, "$Id$")
 
-/*************************************************************************************************/
-
-template<class OBJECT>
-TAO_NS_Object_Find_Worker_T<OBJECT>::TAO_NS_Object_Find_Worker_T (CORBA::Long id)
-  :id_ (id), result_ (0)
-{
-}
-
-/*************************************************************************************************/
-
-template<class TYPE, class OBJECT, class PARENT>
-TAO_NS_Container_T<TYPE, OBJECT, PARENT>::TAO_NS_Container_T (void)
+template<class TYPE>
+TAO_NS_Container_T<TYPE>::TAO_NS_Container_T (void)
   : collection_ (0)
 {
 }
 
-template<class TYPE, class OBJECT, class PARENT>
-TAO_NS_Container_T<TYPE, OBJECT, PARENT>::~TAO_NS_Container_T ()
+template<class TYPE>
+TAO_NS_Container_T<TYPE>::~TAO_NS_Container_T ()
 {
+  delete collection_;
 }
 
-template <class TYPE, class OBJECT, class PARENT> int
-TAO_NS_Container_T<TYPE, OBJECT, PARENT>::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+template <class TYPE> void
+TAO_NS_Container_T<TYPE>::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  // shutdown baseclass.
-  if (TAO_NS_Object_T<OBJECT, PARENT>::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
-    return 1;
-
-  ACE_CHECK_RETURN (1);
-
-  // First inform the children.
   TAO_ESF_Shutdown_Proxy<TYPE> shutdown_worker;
 
   this->collection_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
-
-  /// shutdown Container
-  this->cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  delete collection_;
-
-  return 0;
 }
 
-template<class TYPE, class OBJECT, class PARENT> void
-TAO_NS_Container_T<TYPE, OBJECT, PARENT>::insert (TYPE* type ACE_ENV_ARG_DECL)
+template<class TYPE> void
+TAO_NS_Container_T<TYPE>::insert (TYPE* type ACE_ENV_ARG_DECL)
 {
   this->collection_->connected (type ACE_ENV_ARG_PARAMETER);
 }
 
-template<class TYPE, class OBJECT, class PARENT> void
-TAO_NS_Container_T<TYPE, OBJECT, PARENT>::remove (TYPE* type ACE_ENV_ARG_DECL)
+template<class TYPE> void
+TAO_NS_Container_T<TYPE>::remove (TYPE* type ACE_ENV_ARG_DECL)
 {
   this->collection_->disconnected (type ACE_ENV_ARG_PARAMETER);
 }
 
-template<class TYPE, class OBJECT, class PARENT> void
-TAO_NS_Container_T<TYPE, OBJECT, PARENT>::init_collection (ACE_ENV_SINGLE_ARG_DECL)
+template<class TYPE> void
+TAO_NS_Container_T<TYPE>::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   // get the factory
   TAO_NS_Factory* factory = TAO_NS_PROPERTIES::instance ()->factory ();
@@ -82,4 +58,5 @@ TAO_NS_Container_T<TYPE, OBJECT, PARENT>::init_collection (ACE_ENV_SINGLE_ARG_DE
   // Init variables
   factory->create (this->collection_ ACE_ENV_ARG_PARAMETER);
 }
+
 #endif /* TAO_NS_CONTAINER_T_CPP */