ChangeLogTag: Thu Apr 24 13:01:12 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 22 insertions, 36 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 11dd5e51eec..5f454c36484 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Thu Apr 24 13:01:12 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_type.cpp:
+
+          Substituted full name for local name in generation of
+          parameters for explicit template instantiation.
+
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+
+          Removed generation of explicit template instantiation for
+          TAO_Object_Manager and TAO_Valuetype_Manager. It is now
+          handled elsewhere.
+
 Thu Apr 24 11:48:16 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/DynamicInterface/Request.cpp:
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 00537bf3ded..c5edbc8599f 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -298,7 +298,7 @@ be_type::gen_common_tmplinst (TAO_OutStream *os)
       << (st == AST_Type::FIXED ? "TAO_Fixed_Var_T<"
                                 : "TAO_Var_Var_T<")
       << be_idt << be_idt_nl
-      << this->local_name () << be_uidt_nl
+      << this->name () << be_uidt_nl
       << ">;" << be_uidt << be_uidt;
 
   if (st == AST_Type::VARIABLE)
@@ -306,8 +306,8 @@ be_type::gen_common_tmplinst (TAO_OutStream *os)
       *os << be_nl<< be_nl
           << "template class" << be_idt_nl
           << "TAO_Out_T<" << be_idt << be_idt_nl
-          << this->local_name () << "," << be_nl
-          << this->local_name () << "_var" << be_uidt_nl
+          << this->name () << "," << be_nl
+          << this->name () << "_var" << be_uidt_nl
           << ">;" << be_uidt << be_uidt;
     }
 
@@ -318,7 +318,7 @@ be_type::gen_common_tmplinst (TAO_OutStream *os)
       << (st == AST_Type::FIXED ? "TAO_Fixed_Var_T< \\"
                                 : "TAO_Var_Var_T< \\")
       << be_idt << be_idt_nl
-      << this->local_name () << " \\" << be_uidt_nl
+      << this->name () << " \\" << be_uidt_nl
       << ">" << be_uidt << be_uidt;
 
   if (st == AST_Type::VARIABLE)
@@ -326,8 +326,8 @@ be_type::gen_common_tmplinst (TAO_OutStream *os)
       *os << be_nl << be_nl
           << "# pragma instantiate \\" << be_idt_nl
           << "TAO_Out_T< \\" << be_idt << be_idt_nl
-          << this->local_name () << ", \\" << be_nl
-          << this->local_name () << "_var \\" << be_uidt_nl
+          << this->name () << ", \\" << be_nl
+          << this->name () << "_var \\" << be_uidt_nl
           << ">" << be_uidt << be_uidt;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index e7f971bdcb3..538a13d1078 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -98,33 +98,11 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << be_idt_nl
       << "  defined (ACE_HAS_GNU_REPO)" << be_nl;
 
-  if (node->is_abstract ())
-    {
-      *os << "template class TAO_Abstract_Manager<";
-    }
-  else
-    {
-      *os << "template class TAO_Object_Manager<";
-    }
-
-  *os << node->full_name () << ","
-      << node->full_name () << "_var>;" << be_nl
-      << "template class TAO::Any_Impl_T<" << node->name () << ">;"
+  *os << "template class TAO::Any_Impl_T<" << node->name () << ">;"
       << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl;
 
-  if (node->is_abstract ())
-    {
-      *os << "# pragma instantiate TAO_Abstract_Manager<";
-    }
-  else
-    {
-      *os << "# pragma instantiate TAO_Object_Manager<";
-    }
-
-  *os << node->full_name () << ", "
-      << node->full_name () << "_var>" << be_nl
-      << "# pragma instantiate TAO::Any_Impl_T<" << node->name () << ">"
+  *os << "# pragma instantiate TAO::Any_Impl_T<" << node->name () << ">"
       << be_uidt_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index d9db49eca9d..82e0aa4be8b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -102,15 +102,9 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
   *os << "#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \\"
       << be_idt_nl
       << "  defined (ACE_HAS_GNU_REPO)" << be_nl
-      << "template class TAO_Valuetype_Manager<"
-      << node->full_name () << ", "
-      << node->full_name () << "_var>;" << be_nl
       << "template class TAO::Any_Impl_T<" << node->full_name ()
       << ">;" << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
-      << "#  pragma instantiate TAO_Valuetype_Manager<"
-      << node->full_name () << ", "
-      << node->full_name () << "_var>" << be_nl
       << "#  pragma instantiate TAO::Any_Impl_T<" << node->full_name ()
       << ">" << be_uidt_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";