1 files changed, 13 insertions, 33 deletions

diff --git a/modules/TAO/TAO_IDL/fe/fe_utils.cpp b/modules/TAO/TAO_IDL/fe/fe_utils.cpp
index e25bc64ce02..ebd338096b3 100644
--- a/modules/TAO/TAO_IDL/fe/fe_utils.cpp
+++ b/modules/TAO/TAO_IDL/fe/fe_utils.cpp
@@ -4,6 +4,7 @@
 
 #include "utl_scoped_name.h"
 #include "utl_strlist.h"
+#include "utl_namelist.h"
 #include "utl_identifier.h"
 
 FE_Utils::T_Ref_Info::T_Ref_Info (void)
@@ -36,41 +37,20 @@ FE_Utils::T_Ref_Info::destroy (void)
       params_ = 0;
     }
 }
-  
-FE_Utils::Ext_Port_Description::Ext_Port_Description (void)
-  : port_kind_ (PROVIDES),
-    port_name_ (0),
-    obj_ref_ (0),
-    is_multiple_ (false)
-{
-}
-  
-FE_Utils::Ext_Port_Description::Ext_Port_Description (
-      Port_Kind port_kind,
-      Identifier *port_name,
-      T_Ref_Info *obj_ref,
-      bool is_multiple)
-  : port_kind_ (port_kind),
-    port_name_ (port_name),
-    obj_ref_ (obj_ref),
-    is_multiple_ (is_multiple)
+
+FE_Utils::T_Inst_Info::T_Inst_Info (UTL_ScopedName *n,
+                                    UTL_NameList *args)
+  : name_ (n),
+    args_ (args)
 {
 }
 
 void
-FE_Utils::Ext_Port_Description::destroy (void)
+FE_Utils::T_Inst_Info::destroy (void)
 {
-  if (port_name_ != 0)
-    {
-      port_name_->destroy ();
-      delete port_name_;
-      port_name_ = 0;
-    }
-    
-  if (obj_ref_ != 0)
-    {
-      obj_ref_->destroy ();
-      delete obj_ref_;
-      obj_ref_ = 0;
-    }
-}
+  // The template args are owned by the AST type.
+
+  this->name_->destroy ();
+  delete this->name_;
+  this->name_ = 0;
+}
\ No newline at end of file