1 files changed, 6 insertions, 23 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
index 6736a00efa6..ae737304645 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -1,17 +1,19 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "Repository_i.h"
 #include "PublishesDef_i.h"
+#include "Repository_i.h"
 
-ACE_RCSID(IFR_Service, PublishesDef_i, "$Id$")
+ACE_RCSID (IFRService, 
+           PublishesDef_i, 
+           "$Id$")
 
 TAO_PublishesDef_i::TAO_PublishesDef_i (
     TAO_Repository_i *repo
   )
   : TAO_IRObject_i (repo),
     TAO_Contained_i (repo),
-    TAO_EventDef_i (repo)
+    TAO_EventPortDef_i (repo)
 {
 }
 
@@ -26,25 +28,6 @@ TAO_PublishesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::dk_Publishes;
 }
 
-void
-TAO_PublishesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_IFR_WRITE_GUARD;
-
-  this->update_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-void
-TAO_PublishesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // TODO
-}
-
 CORBA::Contained::Description *
 TAO_PublishesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -58,7 +41,7 @@ TAO_PublishesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Contained::Description *
-TAO_PublishesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
+TAO_PublishesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO