ChangeLogTag: Tue Nov 7 23:13:51 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

21 files changed, 111 insertions, 278 deletions

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 742e63a5870..e5b567283fb 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -43,7 +43,6 @@ TAO_CodeGen::TAO_CodeGen (void)
     server_skeletons_ (0),
     server_template_skeletons_ (0),
     server_inline_ (0),
-    server_template_inline_ (0),
     anyop_header_ (0),
     anyop_source_ (0),
     gperf_input_stream_ (0),
@@ -719,15 +718,6 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
       << be_global->be_get_server_template_hdr_fname (1)
       << "\"";
 
-  // Generate the code that includes the inline file if not included in the
-  // header file.
-  *this->server_template_skeletons_ << "\n\n#if !defined (__ACE_INLINE__)";
-  *this->server_template_skeletons_
-      << "\n#include \""
-      << be_global->be_get_server_template_inline_fname (1)
-      << "\"";
-  *this->server_template_skeletons_ << "\n#endif /* !defined INLINE */\n\n";
-
   // Begin versioned namespace support after initial headers have been
   // included, but before the inline file and post include
   // directives.
@@ -781,47 +771,6 @@ TAO_CodeGen::server_inline (void)
   return this->server_inline_;
 }
 
-// Set the server template inline stream.
-int
-TAO_CodeGen::start_server_template_inline (const char *fname)
-{
-  // Retrieve the singleton instance to the outstream factory.
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // Clean up between multiple files.
-  delete this->server_template_inline_;
-  this->server_template_inline_ = factory->make_outstream ();
-
-  if (!this->server_template_inline_)
-    {
-      return -1;
-    }
-
-  if (this->server_template_inline_->open (fname,
-                                           TAO_OutStream::TAO_SVR_INL)
-       == -1)
-    {
-      return -1;
-    }
-
-  // Generate the ident string, if any.
-  this->gen_ident_string (this->server_template_inline_);
-
-  // Begin versioned namespace support after initial headers have been
-  // included, but before the inline file and post include
-  // directives.
-  *this->server_template_inline_ << be_global->versioning_begin ();
-
-  return 0;
-}
-
-// Get the server template inline stream.
-TAO_OutStream *
-TAO_CodeGen::server_template_inline (void)
-{
-  return this->server_template_inline_;
-}
-
 int
 TAO_CodeGen::start_anyop_header (const char *fname)
 {
@@ -1354,14 +1303,6 @@ TAO_CodeGen::end_server_template_header (void)
   // before this.
   *this->server_template_header_ << be_global->versioning_end ();
 
-  // Insert the code to include the inline file.
-  *this->server_template_header_ << "#if defined (__ACE_INLINE__)";
-  *this->server_template_header_
-      << "\n#include \""
-      << be_global->be_get_server_template_inline_fname (1)
-      << "\"";
-  *this->server_template_header_ << "\n#endif /* defined INLINE */";
-
   // Insert the code to include the template source file.
   *this->server_template_header_
       << "\n\n#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)";
@@ -1395,18 +1336,6 @@ TAO_CodeGen::end_server_template_header (void)
 }
 
 int
-TAO_CodeGen::end_server_template_inline (void)
-{
-  *this->server_template_inline_ << "\n";
-
-  // End versioned namespace support.  Do not place include directives
-  // before this.
-  *this->server_template_inline_ << be_global->versioning_end ();
-
-  return 0;
-}
-
-int
 TAO_CodeGen::end_server_template_skeletons (void)
 {
   // End versioned namespace support.  Do not place include directives
@@ -2465,7 +2394,6 @@ TAO_CodeGen::destroy (void)
   delete this->server_template_skeletons_;
   delete this->client_inline_;
   delete this->server_inline_;
-  delete this->server_template_inline_;
   delete this->anyop_source_;
   delete this->anyop_header_;
 #if !defined (linux) && !defined (__QNX__) && !defined (__GLIBC__)
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 26c63266936..46b004d62ac 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -69,7 +69,6 @@ BE_GlobalData::BE_GlobalData (void)
     server_skeleton_ending_ (ACE::strnew ("S.cpp")),
     server_template_skeleton_ending_ (ACE::strnew ("S_T.cpp")),
     server_inline_ending_ (ACE::strnew ("S.inl")),
-    server_template_inline_ending_ (ACE::strnew ("S_T.inl")),
     anyop_hdr_ending_ (ACE::strnew ("A.h")),
     anyop_src_ending_ (ACE::strnew ("A.cpp")),
     output_dir_ (0),
@@ -359,17 +358,6 @@ BE_GlobalData::be_get_server_inline (UTL_String *idl_file_name,
 }
 
 const char *
-BE_GlobalData::be_get_server_template_inline (UTL_String *idl_file_name,
-                                              bool base_name_only)
-{
-  return be_change_idl_file_extension (idl_file_name,
-                                       be_global->server_template_inline_ending (),
-                                       base_name_only,
-                                       false,
-                                       true);
-}
-
-const char *
 BE_GlobalData::be_get_anyop_header (UTL_String *idl_file_name,
                                     bool base_name_only)
 {
@@ -464,13 +452,6 @@ BE_GlobalData::be_get_server_inline_fname (bool base_name_only)
 }
 
 const char *
-BE_GlobalData::be_get_server_template_inline_fname (bool base_name_only)
-{
-  return be_get_server_template_inline (idl_global->stripped_filename (),
-                                        base_name_only);
-}
-
-const char *
 BE_GlobalData::be_get_anyop_source_fname (bool base_name_only)
 {
   return be_get_anyop_source (idl_global->stripped_filename (),
@@ -851,19 +832,6 @@ BE_GlobalData::server_inline_ending (void) const
 }
 
 void
-BE_GlobalData::server_template_inline_ending (const char* s)
-{
-  delete [] this->server_template_inline_ending_;
-  this->server_template_inline_ending_ = ACE::strnew (s);
-}
-
-const char*
-BE_GlobalData::server_template_inline_ending (void) const
-{
-  return this->server_template_inline_ending_;
-}
-
-void
 BE_GlobalData::anyop_header_ending (const char* s)
 {
   delete [] this->anyop_hdr_ending_;
@@ -1249,9 +1217,6 @@ BE_GlobalData::destroy (void)
   delete [] this->server_inline_ending_;
   this->server_inline_ending_ = 0;
 
-  delete [] this->server_template_inline_ending_;
-  this->server_template_inline_ending_ = 0;
-
   delete [] this->anyop_hdr_ending_;
   this->anyop_hdr_ending_ = 0;
 
@@ -1664,7 +1629,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             be_global->use_clonable_in_args(true);
           }
         else
-          { 
+          {
             ACE_ERROR ((
                 LM_ERROR,
                 ACE_TEXT ("IDL: I don't understand")
@@ -1711,8 +1676,6 @@ BE_GlobalData::parse_args (long &i, char **av)
         //      Default is "S_T.cpp".
         // <-si Server's inline file name ending>
         //      Default is "S.inl".
-        // <-st Server's template inline file name ending>
-        //      Default is "S_T.inl".
         // <-sI Server's implementation skeleton file name ending>
         //      Default is "I.cpp".
 
@@ -1734,12 +1697,6 @@ BE_GlobalData::parse_args (long &i, char **av)
             be_global->server_inline_ending (av[i + 1]);
             ++i;
           }
-        else if (av[i][2] == 't')
-          {
-            idl_global->append_idl_flag (av[i + 1]);
-            be_global->server_template_inline_ending (av[i + 1]);
-            ++i;
-          }
         else if (av[i][2] == 'I')
           {
             idl_global->append_idl_flag (av[i + 1]);
@@ -2741,11 +2698,6 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -st\t\t\tServer's template inline file name ending.")
-      ACE_TEXT (" Default S_T.inl\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
       ACE_TEXT (" -sT\t\t\tServer's template skeleton file name ending.")
       ACE_TEXT (" Default is S_T.cpp\n")
     ));
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 93bcd6f9c2e..43bda6159cc 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -73,9 +73,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
 
   get_op.set_name ((UTL_IdList *) node->name ()->copy ());
   get_op.set_defined_in (node->defined_in ());
-  
+
   UTL_ExceptList *get_exceptions = node->get_get_exceptions ();
-  
+
   if (0 != get_exceptions)
     {
       get_op.be_add_exceptions (get_exceptions->copy ());
@@ -85,7 +85,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // to the operation.
   be_operation_strategy *old_strategy =
     get_op.set_strategy (node->get_get_strategy ()->copy ());
-    
+
   if (0 != old_strategy)
     {
       old_strategy->destroy ();
@@ -160,9 +160,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = get_op.accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SI:
+    case TAO_CodeGen::TAO_ROOT_TIE_SS:
       {
-        be_visitor_operation_tie_si visitor (&ctx);
+        be_visitor_operation_tie_ss visitor (&ctx);
         status = get_op.accept (&visitor);
         break;
       }
@@ -224,7 +224,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
           visitor = 0;
         }
     }
-    
+
   get_op.destroy ();
 
   // Do nothing for readonly attributes.
@@ -243,13 +243,13 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   // The return type  is "void".
   be_predefined_type rt (AST_PredefinedType::PT_void,
                          &sn);
- 
+
   // Argument type is the same as the attribute type.
   AST_Argument *arg =
     idl_global->gen ()->create_argument (AST_Argument::dir_IN,
                                          node->field_type (),
                                          node->name ());
-                                         
+
   arg->set_name ((UTL_IdList *) node->name ()->copy ());
   // Create the operation.
   be_operation set_op (&rt,
@@ -260,9 +260,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
   set_op.set_name ((UTL_IdList *) node->name ()->copy ());
   set_op.set_defined_in (node->defined_in ());
   set_op.be_add_argument (arg);
-  
+
   UTL_ExceptList *set_exceptions = node->get_set_exceptions ();
-  
+
   if (0 != set_exceptions)
     {
       set_op.be_add_exceptions (set_exceptions->copy ());
@@ -347,9 +347,9 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = set_op.accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SI:
+    case TAO_CodeGen::TAO_ROOT_TIE_SS:
       {
-        be_visitor_operation_tie_si visitor (&ctx);
+        be_visitor_operation_tie_ss visitor (&ctx);
         status = set_op.accept (&visitor);
         break;
       }
@@ -424,7 +424,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
       delete visitor;
       visitor = 0;
     }
-    
+
   set_op.destroy ();
   rt.destroy ();
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index bab1d145dd5..2494d2755f3 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -66,7 +66,7 @@
 #include "be_visitor_interface/interface_ss.cpp"
 #include "be_visitor_interface/interface_is.cpp"
 #include "be_visitor_interface/tie_sh.cpp"
-#include "be_visitor_interface/tie_si.cpp"
+#include "be_visitor_interface/tie_ss.cpp"
 #include "be_visitor_interface/any_op_ch.cpp"
 #include "be_visitor_interface/any_op_cs.cpp"
 #include "be_visitor_interface/cdr_op_ch.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index 6619f38955d..c8bef6a36d7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -156,7 +156,7 @@ be_visitor_interface::add_abstract_op_args (AST_Operation *old_op,
     }
 
   UTL_ExceptList *excep_list = old_op->exceptions ();
-  
+
   if (0 != excep_list)
     {
       new_op.be_add_exceptions (excep_list->copy ());
@@ -443,9 +443,9 @@ be_visitor_interface::visit_operation (be_operation *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_TIE_SI:
+    case TAO_CodeGen::TAO_ROOT_TIE_SS:
       {
-        be_visitor_operation_tie_si visitor (&ctx);
+        be_visitor_operation_tie_ss visitor (&ctx);
         status = node->accept (&visitor);
         break;
       }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
index 1f140530861..deacb66cb3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
@@ -100,24 +100,6 @@ be_visitor_interface_si::visit_interface (be_interface *node)
         }
     }
 
-  if (be_global->gen_tie_classes ())
-    {
-      // Generate the TIE class.
-      be_visitor_context ctx (*this->ctx_);
-      ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SI);
-      ctx.stream (tao_cg->server_template_inline ());
-      be_visitor_interface_tie_si visitor (&ctx);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_sh::"
-                             "visit_interface - "
-                             "codegen for TIE class failed\n"),
-                            -1);
-        }
-    }
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 7b52627a051..ad0c7b07ad7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -285,7 +285,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
     *os << be_uidt_nl
         << "}";
-    
+
     is_a.destroy ();
     rt.destroy ();
     s.get ()->destroy ();
@@ -393,7 +393,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
     *os << be_uidt_nl
         << "}";
-        
+
     non_existent.destroy ();
     rt.destroy ();
   }
@@ -504,7 +504,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
     *os << be_uidt_nl
         << "}";
-    
+
     repository_id.destroy ();
     s.get ()->destroy ();
   }
@@ -666,7 +666,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
         << ");" << TAO_ACE_CHECK () << be_uidt_nl
         << "}";
-  
+
     get_component.destroy ();
     rt.destroy ();
   }
@@ -734,6 +734,24 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   this->this_method (node);
 
+  if (be_global->gen_tie_classes ())
+    {
+      // Generate the TIE class.
+      be_visitor_context ctx (*this->ctx_);
+      ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SS);
+      ctx.stream (tao_cg->server_template_skeletons ());
+      be_visitor_interface_tie_ss visitor (&ctx);
+
+      if (node->accept (&visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_ss::"
+                             "visit_interface - "
+                             "codegen for TIE class failed\n"),
+                            -1);
+        }
+    }
+
   return 0;
 }
 
@@ -766,12 +784,12 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
                              "bad node in this scope\n"),
                             -1);
         }
-        
+
       AST_Decl::NodeType nt = d->node_type ();
-  
+
       UTL_ScopedName *item_new_name = 0;
       UTL_ScopedName *new_name = 0;
-      
+
       if (AST_Decl::NT_op == nt || AST_Decl::NT_attr == nt)
         {
           ACE_NEW_RETURN (item_new_name,
@@ -799,10 +817,10 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
           op->set_name (new_name);
           op->set_defined_in (node);
           op->is_abstract (node->is_abstract ());
-          
+
           be_visitor_operation_ss op_visitor (&ctx);
           op_visitor.visit_operation (op);
-          
+
           op->set_name (old_name);
           op->set_defined_in (base);
           op->is_abstract (base->is_abstract ());
@@ -817,21 +835,21 @@ be_visitor_interface_ss::gen_abstract_ops_helper (be_interface *node,
                                  attr->is_abstract ());
           new_attr.set_defined_in (node);
           new_attr.set_name (new_name);
-          
+
           UTL_ExceptList *get_exceptions = attr->get_get_exceptions ();
-          
+
           if (0 != get_exceptions)
             {
               new_attr.be_add_get_exceptions (get_exceptions->copy ());
             }
-            
+
           UTL_ExceptList *set_exceptions = attr->get_set_exceptions ();
-          
+
           if (0 != set_exceptions)
             {
               new_attr.be_add_set_exceptions (set_exceptions->copy ());
             }
-            
+
           be_visitor_attribute attr_visitor (&ctx);
           attr_visitor.visit_attribute (&new_attr);
           ctx.attribute (0);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index d5d3c41885a..28aa5d09be6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -170,8 +170,8 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
     }
 
   be_visitor_context ctx;
-  ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SH);
   ctx.stream (os);
+  ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SH);
   be_visitor_interface_tie_sh visitor (&ctx);
 
   if (visitor.visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
index b92c0a98860..9052c5271dc 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
@@ -8,7 +8,7 @@
 //    TAO IDL
 //
 // = FILENAME
-//    tie_si.cpp
+//    tie_ss.cpp
 //
 // = DESCRIPTION
 //    Visitor generating code for TIE classes for the Interface node in the
@@ -20,7 +20,7 @@
 // ============================================================================
 
 ACE_RCSID (be_visitor_interface,
-           tie_si,
+           tie_ss,
            "$Id$")
 
 
@@ -28,19 +28,19 @@ ACE_RCSID (be_visitor_interface,
 // Interface visitor for server inline
 // ************************************************************************
 
-be_visitor_interface_tie_si::be_visitor_interface_tie_si (
+be_visitor_interface_tie_ss::be_visitor_interface_tie_ss (
     be_visitor_context *ctx
   )
   : be_visitor_interface (ctx)
 {
 }
 
-be_visitor_interface_tie_si::~be_visitor_interface_tie_si (void)
+be_visitor_interface_tie_ss::~be_visitor_interface_tie_ss (void)
 {
 }
 
 int
-be_visitor_interface_tie_si::visit_interface (be_interface *node)
+be_visitor_interface_tie_ss::visit_interface (be_interface *node)
 {
   if (node->srv_inline_gen ()
       || node->imported ()
@@ -95,14 +95,14 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE" << be_nl
+  *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename << " (T &t)" << be_nl
       << "\t: ptr_ (&t)," << be_nl
       << "\t  poa_ (PortableServer::POA::_nil ())," << be_nl
       << "\t  rel_ (0)" << be_nl
       << "{}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE" << be_nl
+  *os << "template <class T> " << be_nl
       << fulltiename << "<T>::" << localtiename
       << " (T &t, PortableServer::POA_ptr poa)" << be_nl
       << "\t: ptr_ (&t)," << be_nl
@@ -110,7 +110,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
       << "\t  rel_ (0)" << be_nl
       << "{}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE" << be_nl
+  *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename
       << " (T *tp, ::CORBA::Boolean release)" << be_nl
       << "\t: ptr_ (tp)," << be_nl
@@ -118,7 +118,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
       << "\t  rel_ (release)" << be_nl
       << "{}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE" << be_nl
+  *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename
       << " (T *tp, PortableServer::POA_ptr poa, ::CORBA::Boolean release)"
       << be_nl
@@ -127,7 +127,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
       << "\t  rel_ (release)" << be_nl
       << "{}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE" << be_nl
+  *os << "template <class T>" << be_nl
       << fulltiename << "<T>::~" << localtiename << " (void)" << be_nl
       << "{" << be_idt_nl
       << "if (this->rel_)" << be_idt_nl
@@ -136,13 +136,13 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
       << "}" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE T *" << be_nl
+  *os << "template <class T> T *" << be_nl
       << fulltiename << "<T>::_tied_object (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->ptr_;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE void" << be_nl
+  *os << "template <class T> void" << be_nl
       << fulltiename << "<T>::_tied_object (T &obj)" << be_nl
       << "{" << be_idt_nl
       << "if (this->rel_)" << be_idt_nl
@@ -153,7 +153,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
       << "this->rel_ = 0;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE void" << be_nl
+  *os << "template <class T> void" << be_nl
       << fulltiename << "<T>::_tied_object (T *obj, "
       << "::CORBA::Boolean release)" << be_nl
       << "{" << be_idt_nl
@@ -165,19 +165,19 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
       << "this->rel_ = release;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE ::CORBA::Boolean" << be_nl
+  *os << "template <class T>  ::CORBA::Boolean" << be_nl
       << fulltiename << "<T>::_is_owner (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->rel_;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE void" << be_nl
+  *os << "template <class T> void" << be_nl
       << fulltiename << "<T>::_is_owner ( ::CORBA::Boolean b)" << be_nl
       << "{" << be_idt_nl
       << "this->rel_ = b;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "template <class T> ACE_INLINE "
+  *os << "template <class T> "
       << "PortableServer::POA_ptr" << be_nl
       << fulltiename
       << "<T>::_default_POA ("
@@ -197,7 +197,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
 
   int status =
     node->traverse_inheritance_graph (
-              be_visitor_interface_tie_si::method_helper,
+              be_visitor_interface_tie_ss::method_helper,
               os
             );
 
@@ -214,13 +214,13 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
 }
 
 int
-be_visitor_interface_tie_si::visit_component (be_component *node)
+be_visitor_interface_tie_ss::visit_component (be_component *node)
 {
   return this->visit_interface (node);
 }
 
 int
-be_visitor_interface_tie_si::method_helper (be_interface *derived,
+be_visitor_interface_tie_ss::method_helper (be_interface *derived,
                                             be_interface *node,
                                             TAO_OutStream *os)
 {
@@ -234,16 +234,16 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived,
     }
 
   be_visitor_context ctx;
-  ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SI);
   ctx.interface (derived);
   ctx.stream (os);
-  be_visitor_interface_tie_si visitor (&ctx);
+  ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SS);
+  be_visitor_interface_tie_ss visitor (&ctx);
 
   if (visitor.visit_scope (node) == -1)
 
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_tie_si::"
+                         "be_visitor_interface_tie_ss::"
                          "method_helper\n"),
                         -1);
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
index 6b5b8e35f33..11b3ed2635b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp
@@ -70,7 +70,7 @@
 #include "be_visitor_operation/rettype.cpp"
 #include "be_visitor_operation/rettype_return_cs.cpp"
 #include "be_visitor_operation/tie_sh.cpp"
-#include "be_visitor_operation/tie_si.cpp"
+#include "be_visitor_operation/tie_ss.cpp"
 #include "be_visitor_operation/upcall_command_ss.cpp"
 
 // AMI
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
index ffa3758d8c8..8675c7ecd8f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
@@ -8,7 +8,7 @@
 //    TAO IDL
 //
 // = FILENAME
-//    tie_si.cpp
+//    tie_ss.cpp
 //
 // = DESCRIPTION
 //    Visitor generating code for operations for the TIE class.
@@ -19,25 +19,25 @@
 // ============================================================================
 
 ACE_RCSID (be_visitor_operation,
-           tie_si,
+           tie_ss,
            "$Id$")
 
 // ************************************************************
 // Operation visitor for server inline for TIE class operations.
 // ************************************************************
 
-be_visitor_operation_tie_si::be_visitor_operation_tie_si (
+be_visitor_operation_tie_ss::be_visitor_operation_tie_ss (
     be_visitor_context *ctx
   )
   : be_visitor_scope (ctx)
 {
 }
 
-be_visitor_operation_tie_si::~be_visitor_operation_tie_si (void)
+be_visitor_operation_tie_ss::~be_visitor_operation_tie_ss (void)
 {
 }
 
-int be_visitor_operation_tie_si::visit_operation (be_operation *node)
+int be_visitor_operation_tie_ss::visit_operation (be_operation *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -46,7 +46,7 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
   if (!intf)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_si::"
+                         "(%N:%l) be_visitor_operation_tie_ss::"
                          "visit_operation - "
                          "bad interface scope\n"),
                         -1);
@@ -58,7 +58,7 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_si::"
+                         "(%N:%l) be_visitor_operation_tie_ss::"
                          "visit_operation - "
                          "Bad return type\n"),
                         -1);
@@ -100,7 +100,7 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from " << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << "template <class " << template_name.c_str () << "> ACE_INLINE\n";
+  *os << "template <class " << template_name.c_str () << ">" << be_nl;
 
   // Generate the return type mapping (same as in the header file).
   be_visitor_context ctx (*this->ctx_);
@@ -109,7 +109,7 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
   if (bt->accept (&oro_visitor) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_tie_si::"
+                         "(%N:%l) be_visitor_operation_tie_ss::"
                          "visit_operation - "
                          "codegen for return type failed\n"),
                         -1);
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 9c3ce0b4462..44ae5a92566 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -476,11 +476,6 @@ int be_visitor_root::visit_root (be_root *node)
         );
       break;
     case TAO_CodeGen::TAO_ROOT_SI:
-      if (be_global->gen_tie_classes ())
-        {
-          (void) tao_cg->end_server_template_inline ();
-        }
-
       tao_cg->end_server_inline ();
       break;
     case TAO_CodeGen::TAO_ROOT_SS:
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
index 77cd9ceb807..86c0b7e6e71 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root, 
-           root_si, 
+ACE_RCSID (be_visitor_root,
+           root_si,
            "$Id$")
 
 // ***********************************************
@@ -44,24 +44,10 @@ be_visitor_root_si::init (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root_si::init - "
-                         "server inline open failed\n"), 
+                         "server inline open failed\n"),
                         -1);
     }
 
-  if (be_global->gen_tie_classes ())
-    {
-      if (tao_cg->start_server_template_inline (
-              be_global->be_get_server_template_inline_fname ()
-            )
-          == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_root_si::init - "
-                             "Error opening server template inline file\n"),
-                            -1);
-        }
-    }
-
   // init stream
   this->ctx_->stream (tao_cg->server_inline ());
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
index fcaf4307fac..dbc1581678b 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root, 
-           root_ss, 
+ACE_RCSID (be_visitor_root,
+           root_ss,
            "$Id$")
 
 // ******************************************************
@@ -46,7 +46,7 @@ be_visitor_root_ss::init (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_root_ss::init - "
-                         "Error opening server skeletons file\n"), 
+                         "Error opening server skeletons file\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
index c0d397965d0..a79c5025119 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_root, 
-           root_sth, 
+ACE_RCSID (be_visitor_root,
+           root_sth,
            "$Id$")
 
 // ****************************************
@@ -156,9 +156,7 @@ be_visitor_root_sth::visit_interface (be_interface *node)
 
   // Generate the TIE class.
 
-  this->ctx_->state (TAO_CodeGen::TAO_ROOT_TIE_SH);
   this->ctx_->node (node);
-
   be_visitor_interface_tie_sh visitor (this->ctx_);
 
   if (node->accept (&visitor) == -1)
@@ -170,8 +168,6 @@ be_visitor_root_sth::visit_interface (be_interface *node)
                         -1);
     }
 
-  this->ctx_->state (TAO_CodeGen::TAO_ROOT_TIE_SH);
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index a6e2aa20c89..0c512c36374 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -141,7 +141,7 @@ public:
       TAO_ROOT_SI,
       TAO_ROOT_SS,
       TAO_ROOT_TIE_SH,
-      TAO_ROOT_TIE_SI,
+      TAO_ROOT_TIE_SS,
       TAO_ROOT_IH,
       TAO_ROOT_IS,
       TAO_ROOT_ANY_OP_CH,
@@ -256,9 +256,6 @@ public:
   int start_server_inline (const char *fname);
   // Set the server inline stream.
 
-  int start_server_template_inline (const char *fname);
-  // Set the server template inline stream.
-
   int start_server_skeletons (const char *fname);
   // Set the server skeletons stream.
 
@@ -296,9 +293,6 @@ public:
   int end_server_template_header (void);
   // Put a last #endif in the server template header.
 
-  int end_server_template_inline (void);
-  // Put a last #endif in the server template header.
-
   int end_server_template_skeletons (void);
   // Put a last #endif in the server skeletons.
 
@@ -446,9 +440,6 @@ private:
   TAO_OutStream *server_inline_;
   // Server side inline file.
 
-  TAO_OutStream *server_template_inline_;
-  // Server side template inline file.
-
   TAO_OutStream *anyop_header_;
   // Anyop header file.
 
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 1c70d2cec26..f29df3a6175 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -98,9 +98,6 @@ public:
   static const char *be_get_server_inline_fname (
       bool base_name_only = 0
     );
-  static const char *be_get_server_template_inline_fname (
-      bool base_name_only = 0
-    );
   static const char *be_get_anyop_source_fname (
       bool base_name_only = 0
     );
@@ -133,8 +130,6 @@ public:
     );
   static const char *be_get_server_inline (UTL_String *idl_file_name,
                                            bool base_name_only = 0);
-  static const char *be_get_server_template_inline (UTL_String *idl_file_name,
-                                                    bool base_name_only = 0);
   static const char *be_get_anyop_header (UTL_String *idl_file_name,
                                           bool base_name_only = 0);
   static const char *be_get_anyop_source (UTL_String *idl_file_name,
@@ -325,12 +320,6 @@ public:
   const char* server_inline_ending (void) const;
   // Get the server_inline_ending.
 
-  void server_template_inline_ending (const char* s);
-  //  Set the server_template_inline_ending.
-
-  const char* server_template_inline_ending (void) const;
-  // Get the server_template_inline_ending.
-
   void anyop_header_ending (const char* s);
   // Set the anyop_header_ending.
 
@@ -661,9 +650,6 @@ private:
   // Server's inline file name ending. Default is "S.i".
   char* server_inline_ending_;
 
-  // Server's template inline file name ending. Default is "S_T.i".
-  char* server_template_inline_ending_;
-
   // Anyop header file name ending. Default is "A.h".
   char* anyop_hdr_ending_;
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index 996495375c7..926331cabf7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -39,7 +39,7 @@
 #include "be_visitor_interface/cdr_op_ch.h"
 #include "be_visitor_interface/cdr_op_cs.h"
 #include "be_visitor_interface/tie_sh.h"
-#include "be_visitor_interface/tie_si.h"
+#include "be_visitor_interface/tie_ss.h"
 #include "be_visitor_interface/ami_interface_ch.h"
 #include "be_visitor_interface/smart_proxy_ch.h"
 #include "be_visitor_interface/smart_proxy_cs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
index b097b77be1a..9f6c28b733a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
@@ -8,7 +8,7 @@
 //    TAO IDL
 //
 // = FILENAME
-//    tie_si.h
+//    tie_ss.h
 //
 // = DESCRIPTION
 //    Concrete visitor for the Interface node.
@@ -19,25 +19,25 @@
 //
 // ============================================================================
 
-#ifndef _BE_INTERFACE_TIE_SI_H_
-#define _BE_INTERFACE_TIE_SI_H_
+#ifndef _BE_INTERFACE_TIE_SS_H_
+#define _BE_INTERFACE_TIE_SS_H_
 
-class be_visitor_interface_tie_si : public be_visitor_interface
+class be_visitor_interface_tie_ss : public be_visitor_interface
 {
   //
   // = TITLE
-  //   be_visitor_interface_tie_si
+  //   be_visitor_interface_tie_ss
   //
   // = DESCRIPTION
-  //   This is a concrete visitor to generate the server inline for operations
+  //   This is a concrete visitor to generate the server skeleton for operations
   //   of the TIE class
   //
   //
 public:
-  be_visitor_interface_tie_si (be_visitor_context *ctx);
+  be_visitor_interface_tie_ss (be_visitor_context *ctx);
   // constructor
 
-  ~be_visitor_interface_tie_si (void);
+  ~be_visitor_interface_tie_ss (void);
   // destructor
 
   virtual int visit_interface (be_interface *node);
@@ -52,4 +52,4 @@ public:
   // helper method to generate method declaration in the TIE classes.
 };
 
-#endif /* _BE_INTERFACE_TIE_SI_H_ */
+#endif /* _BE_INTERFACE_TIE_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index 729617814ea..3ac422ee3a1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -33,7 +33,7 @@
 #include "be_visitor_operation/operation_ss.h"
 #include "be_visitor_operation/operation_is.h"
 #include "be_visitor_operation/tie_sh.h"
-#include "be_visitor_operation/tie_si.h"
+#include "be_visitor_operation/tie_ss.h"
 #include "be_visitor_operation/arglist.h"
 #include "be_visitor_operation/rettype.h"
 #include "be_visitor_operation/rettype_return_cs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
index e38012009a7..20e055a6a14 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
@@ -8,25 +8,24 @@
 //    TAO IDL
 //
 // = FILENAME
-//    tie_si.h
+//    tie_ss.h
 //
 // = DESCRIPTION
-//    Visitor for generating code for IDL operations for the TIE class inside
-//    the server inline
+//    Visitor for generating code for IDL operations for the TIE class
 //
 // = AUTHOR
 //    Aniruddha Gokhale
 //
 // ============================================================================
 
-#ifndef _BE_VISITOR_OPERATION_TIE_SI_H_
-#define _BE_VISITOR_OPERATION_TIE_SI_H_
+#ifndef _BE_VISITOR_OPERATION_TIE_SS_H_
+#define _BE_VISITOR_OPERATION_TIE_SS_H_
 
 // ***********************************************************************
 // Operation visitor for operation declaration inside the TIE class
 // ***********************************************************************
 
-class be_visitor_operation_tie_si : public be_visitor_scope
+class be_visitor_operation_tie_ss : public be_visitor_scope
 {
   //
   // = TITLE
@@ -37,14 +36,14 @@ class be_visitor_operation_tie_si : public be_visitor_scope
   //
   //
 public:
-  be_visitor_operation_tie_si (be_visitor_context *ctx);
+  be_visitor_operation_tie_ss (be_visitor_context *ctx);
   // constructor
 
-  ~be_visitor_operation_tie_si (void);
+  ~be_visitor_operation_tie_ss (void);
   // destructor
 
   virtual int visit_operation (be_operation *node);
   // set the right context and make a visitor
 };
 
-#endif /* _BE_VISITOR_OPERATION_TIE_SI_H_ */
+#endif /* _BE_VISITOR_OPERATION_TIE_SS_H_ */