ChangeLogTag: Mon Apr 30 18:49:56 2001 Jeff Parsons <parsons@cs.wustl.edu>

65 files changed, 13141 insertions, 12724 deletions

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index a50746593a1..a682b9e85e7 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -584,6 +584,8 @@ TAO_CodeGen::start_server_template_header (const char *fname)
 
       *this->server_template_header_ << "#endif /* _MSC_VER */\n\n";
 
+      *this->server_template_header_ << "#if defined (ACE_HAS_USING_KEYWORD)\n\n";
+
       return 0;
     }
 }
@@ -805,6 +807,8 @@ TAO_CodeGen::start_server_template_inline (const char *fname)
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_template_inline_);
 
+  *this->server_template_inline_ << "#if defined (ACE_HAS_USING_KEYWORD)\n\n";
+
   return 0;
 }
 
@@ -1054,6 +1058,8 @@ TAO_CodeGen::end_implementation_header (const char *fname)
 int
 TAO_CodeGen::end_server_template_header (void)
 {
+  *this->server_template_header_ << "#endif /* ACE_HAS_USING_KEYWORD */\n";
+
   // Insert the code to include the inline file.
   *this->server_template_header_ << "\n#if defined (__ACE_INLINE__)\n";
   *this->server_template_header_
@@ -1099,6 +1105,14 @@ TAO_CodeGen::end_server_template_header (void)
 }
 
 int
+TAO_CodeGen::end_server_template_inline (void)
+{
+  *this->server_template_inline_ << "#endif /* ACE_HAS_USING_KEYWORD */\n";
+
+  return 0;
+}
+
+int
 TAO_CodeGen::end_server_template_skeletons (void)
 {
   // Code to put the last #endif.
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 5ade6fb5573..b0338f3d09a 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -67,10 +67,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // BE_produce.cc - Produce the work of the BE - does nothing in the
 //		   dummy BE
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-#include  "TAO_IDL_BE_Export.h"
+#include "idl.h"
+#include "idl_extern.h"
+#include "be.h"
+#include "be_visitor_root.h"
+#include "TAO_IDL_BE_Export.h"
 
 ACE_RCSID(be, be_produce, "$Id$")
 
@@ -252,7 +253,7 @@ BE_produce (void)
   ctx.reset ();
   ctx.state (TAO_CodeGen::TAO_ROOT_SS);
 
-  // create a visitor.
+  // Create a visitor.
   visitor = tao_cg->make_visitor (&ctx);
 
   // Generate code for the server skeletons.
@@ -266,18 +267,37 @@ BE_produce (void)
 
   delete visitor;
 
+  // (7) Generated server template header.
+  if (be_global->gen_tie_classes ())
+    {
+      ctx.reset ();
+      ctx.state (TAO_CodeGen::TAO_ROOT_TIE_SH);
+
+      // Create a visitor.
+      be_visitor_root_sth sth_visitor (&ctx);
+
+      // Generate code for the implementation header.
+      if (root->accept (&sth_visitor) == -1)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "(%N:%l) be_produce - "
+                      "server template header for Root failed\n"));
+          BE_abort ();
+        }
+    }
+
   // Check if the flags are set for generating the 
   // the implementation header and skeleton files.
   if (be_global->gen_impl_files ())
     {
-      // (7) generate implementation skeleton header.      
+      // (8) generate implementation header.      
       ctx.reset ();
       ctx.state (TAO_CodeGen::TAO_ROOT_IH);
 
       // Create a visitor.
       visitor = tao_cg->make_visitor (&ctx);
 
-      // Generate code for the implementation skeleton header.
+      // Generate code for the implementation header.
       if (root->accept (visitor) == -1)
         {
           ACE_ERROR ((LM_ERROR,
@@ -288,14 +308,14 @@ BE_produce (void)
       
       delete visitor;
       
-      // (8) Generate implementation skeleton header.      
+      // (9) Generate implementation source.      
       ctx.reset ();
       ctx.state (TAO_CodeGen::TAO_ROOT_IS);
 
       // Create a visitor.
       visitor = tao_cg->make_visitor (&ctx);
       
-      // Generate code for the implementation skeleton header.
+      // Generate code for the implementation source.
       if (root->accept (visitor) == -1)
         {
           ACE_ERROR ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_decl.cpp b/TAO/TAO_IDL/be/be_visitor_decl.cpp
index 8539de31d30..0e27e8545b3 100644
--- a/TAO/TAO_IDL/be/be_visitor_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_decl.cpp
@@ -36,7 +36,7 @@ be_visitor_decl::be_visitor_decl (be_visitor_context *ctx)
 
 be_visitor_decl::~be_visitor_decl (void)
 {
-  delete this->ctx_;
+//  delete this->ctx_;
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index a029bf221d3..32585b020d8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -108,6 +108,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   // Now the interface definition itself.
   os->gen_ifdef_macro (node->flat_name ());
+  os->indent ();
 
   if (!node->is_local ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index d60caac05e2..7a44cf5cb8e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -54,14 +54,14 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
 
   os = this->ctx_->stream ();
 
-  // generate the skeleton class name
+  // Generate the skeleton class name.
 
-  os->indent (); // start with whatever indentation level we are at
+  os->indent ();
 
-  // we shall have a POA_ prefix only if we are at the topmost level
+  // We shall have a POA_ prefix only if we are at the topmost level.
   if (!node->is_nested ())
     {
-      // we are outermost
+      // We are outermost.
       ACE_OS::sprintf (namebuf, "POA_%s", node->local_name ());
     }
   else
@@ -71,45 +71,53 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
 
   *os << "class " << namebuf << ";" << be_nl;
 
-  // generate the _ptr declaration
+  // Generate the _ptr declaration.
   *os << "typedef " << namebuf << " *" << namebuf
       << "_ptr;" << be_nl;
   
-  // Forward class declaration
+  // Forward class declaration.
   *os << "// Forward Classes Declaration" << be_nl;
 
   if (be_global->gen_thru_poa_collocation ())
-    *os << "class " << node->thru_poa_proxy_impl_name () << ";" << be_nl;
+    {
+      *os << "class " << node->thru_poa_proxy_impl_name () << ";" << be_nl;
+    }
+
   if (be_global->gen_direct_collocation ())
-    *os << "class " << node->direct_proxy_impl_name () << ";" << be_nl;
+    {
+      *os << "class " << node->direct_proxy_impl_name () << ";" << be_nl;
+    }
   
-  if (be_global->gen_thru_poa_collocation () ||
-      be_global->gen_direct_collocation ())
-    *os << "class " << node->strategized_proxy_broker_name () << ";" << be_nl;
+  if (be_global->gen_thru_poa_collocation () 
+      || be_global->gen_direct_collocation ())
+    {
+      *os << "class " << node->strategized_proxy_broker_name () << ";" << be_nl;
+    }
 
   *os << be_nl;
 
-  // now generate the class definition
+  // Now generate the class definition.
   *os << "class " << be_global->skel_export_macro ()
       << " " << namebuf << " : ";
   if (node->n_inherits () > 0)
     {
-      // this interface inherits from other interfaces
-      be_interface *intf; // inherited interface
+      // This interface inherits from other interfaces.
+      be_interface *intf;
 
       *os << "public virtual ";
       intf = be_interface::narrow_from_decl (node->inherits ()[0]);
       *os << intf->relative_skel_name (node->full_skel_name ());
+
       for (i = 1; i < node->n_inherits (); i++)
         {
           *os << ", public virtual ";
           intf = be_interface::narrow_from_decl (node->inherits ()[i]);
           *os << intf->relative_skel_name (node->full_skel_name ());
-        }  // end of for loop
+        } 
     }
   else
     // We don't inherit from another user defined object, hence our
-    // base class is the ServantBase class
+    // base class is the ServantBase class.
     *os << " public virtual PortableServer::ServantBase";
 
   *os << be_nl
@@ -133,7 +141,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "const char* logical_type_id" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
-  // add a skeleton for our _is_a method
+  // Add a skeleton for our _is_a method.
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
@@ -143,7 +151,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
-  // add a skeleton for our _non_existent method
+  // Add a skeleton for our _non_existent method.
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
@@ -153,7 +161,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
-  // add a skeleton for our _interface method
+  // Add a skeleton for our _interface method.
   *os << "static void _interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
@@ -163,7 +171,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
-  // add the dispatch method
+  // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_req," << be_nl
       << "void *_tao_context," << be_nl
@@ -179,11 +187,11 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << be_uidt << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
-  // the _interface_repository_id method.
+  // The _interface_repository_id method.
   *os << "virtual const char* _interface_repository_id "
       << "(void) const;\n\n";
 
-  // generate code for elements in the scope (e.g., operations).
+  // Generate code for elements in the scope (e.g., operations).
   if (this->visit_scope (node) ==  -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -193,7 +201,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                         -1);
     }
 
-  // generate skeletons for operations of our base classes. These
+  // Generate skeletons for operations of our base classes. These
   // skeletons just cast the pointer to the appropriate type
   // before invoking the call.
   if (node->traverse_inheritance_graph (be_interface::gen_skel_helper, os) == -1)
@@ -204,6 +212,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                          "inheritance graph traversal failed\n"),
                         -1);
     }
+
   // Generate the embedded RequestInfo classes per operation.
   // This is to be used by interceptors.
   be_visitor_context ctx (*this->ctx_);
@@ -211,6 +220,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   // Interceptor related classes.
   ctx.state (TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_SH);
   visitor = tao_cg->make_visitor (&ctx);
+
   if (!visitor || (node->accept (visitor) == -1))
     {
       delete visitor;
@@ -220,6 +230,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                          "codegen for interceptor classes failed\n"),
                         -1);
     }
+
   delete visitor;
   visitor = 0;
 
@@ -229,28 +240,32 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       be_global->gen_direct_collocation ())
     {
       ctx = *this->ctx_;
-      // Generate Strategized  Proxy Broker
+      // Generate strategized proxy broker.
       ctx.state (TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH);
       visitor = tao_cg->make_visitor (&ctx);
       if (node->accept (visitor) == -1)
-	{
-	  delete visitor;
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "be_visitor_interface_sh::"
-			     "visit_interface - "
-			     "codegen for thru_poa_collocated class failed\n"),
-			    -1);
-	}
+	      {
+	        delete visitor;
+	        ACE_ERROR_RETURN ((LM_ERROR,
+			           "be_visitor_interface_sh::"
+			           "visit_interface - "
+			           "codegen for thru_poa_collocated class failed\n"),
+			          -1);
+	      }
+
       delete visitor;
     }
+
   ctx = *this->ctx_;
-  // generate the collocated class
+
+  // Generate the collocated class.
   if (be_global->gen_thru_poa_collocation ())
     {
       visitor = 0;
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_INTERFACE_THRU_POA_PROXY_IMPL_SH);
       visitor = tao_cg->make_visitor (&ctx);
+
       if (visitor == 0 || node->accept (visitor) == -1)
         {
           delete visitor;
@@ -260,15 +275,19 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                              "codegen for thru_poa_collocated class failed\n"),
                             -1);
         }
+
       delete visitor;
     }
+
   ctx = *this->ctx_;
+
   if (be_global->gen_direct_collocation ())
     {
       visitor = 0;
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH);
       visitor = tao_cg->make_visitor (&ctx);
+
       if (visitor == 0 || node->accept (visitor) == -1)
         {
           delete visitor;
@@ -278,30 +297,10 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                              "codegen for thru_poa_collocated class failed\n"),
                             -1);
         }
-      delete visitor;
-    }
-
-  if (be_global->gen_tie_classes ())
-    {
-      // generate the TIE class.
-      ctx = *this->ctx_;
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SH);
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor || (node->accept (visitor) == -1))
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_sh::"
-                             "visit_interface - "
-                             "codegen for TIE class failed\n"),
-                            -1);
-        }
 
       delete visitor;
     }
 
   *os << "\n";
-  ctx.stream (tao_cg->server_template_header ());
-
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
index cd133ec1bad..eda89699dd6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -52,54 +52,39 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface
       << ");" << be_uidt_nl << be_nl;
 
 
-  *os << "private:" << be_nl << be_nl
+  *os << "private:" << be_idt_nl
       << "// Helper methods that takes care to create the proxy" << be_nl
-      << "// as soon as their use is necessary."
-      << be_idt_nl
+      << "// as soon as their use is necessary." << be_nl
       << "void create_proxy (" << be_idt_nl << "int collocation_strategy,"
       << be_nl << "CORBA::Environment &ACE_TRY_ENV"
       << be_uidt_nl << ");"
-      << be_uidt_nl << be_nl
-      << "private:" << be_idt_nl << be_nl
+      << be_nl << be_nl
       << "// Caches the proxy implementations. The proxy implementation" << be_nl
       << "// are totally stateless, and those can be shared by all the" << be_nl
       << "// instances of a given IDL interface type." << be_nl
       << "::" << node->full_base_proxy_impl_name () << be_nl
-      <<" *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];"
+      << "*proxy_cache_[TAO_Collocation_Strategies::CS_LAST];"
       << be_nl << be_nl
-      << "TAO_SYNCH_MUTEX mutex_;"
-      << be_uidt_nl;
+      << "TAO_SYNCH_MUTEX mutex_;" << be_nl;
 
   // Factory Function declaration.
   *os << "// This funxtion is used to get an handle to the unique instance" << be_nl
       << "// of the Strategized Proxy Broker that is available for a given" << be_nl
       << "// interface."
-      << be_nl << be_nl;
+      << be_uidt_nl << be_nl;
 
   *os << "public:" << be_idt_nl
-      << "static " << node->strategized_proxy_broker_name () << " *the" << node->strategized_proxy_broker_name ()
+      << "static " << node->strategized_proxy_broker_name () 
+      << " *the" << node->strategized_proxy_broker_name ()
       << " (void);" << be_uidt_nl;
 
   *os << "};" << be_nl << be_nl;
 
-
-  /*
-  if (node->is_nested ())
-    *os << "TAO_NAMESPACE_STORAGE_CLASS ";
-  else
-    *os << "static ";
-    */
-
-
-
-    *os << be_nl
+  *os << be_nl
       << "//" << be_nl
       << "//            End Strategized Proxy Broker Declaration " << be_nl
       << "///////////////////////////////////////////////////////////////////////"
       << be_nl << be_nl;
 
-    // Close #ifdef Guard.
-    //  os->gen_endif ();
-
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
index a9140ac7d24..c0b0a72140b 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp
@@ -23,8 +23,6 @@ be_visitor_interface_thru_poa_proxy_impl_sh::visit_interface (be_interface *node
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  //  os->gen_ifdef_macro (node->flat_name (), "THRU_POA_PROXY_IMPL_");
-  os->decr_indent (0);
   *os << be_nl
       << "///////////////////////////////////////////////////////////////////////" << be_nl
       << "//                    ThruPOA  Impl. Declaration" << be_nl
@@ -61,7 +59,8 @@ be_visitor_interface_thru_poa_proxy_impl_sh::visit_interface (be_interface *node
     *os << node->thru_poa_proxy_impl_name () << " (void);" << be_nl << be_nl;
 
     // Dtor
-    *os << "virtual ~" << node->thru_poa_proxy_impl_name () << " (void) { }" << be_nl << be_nl;
+    *os << "virtual ~" << node->thru_poa_proxy_impl_name () 
+        << " (void) { }" << be_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
     {
@@ -71,7 +70,7 @@ be_visitor_interface_thru_poa_proxy_impl_sh::visit_interface (be_interface *node
                          "codegen for scope failed\n"), -1);
     }
 
-  *os << "};" << be_uidt << be_nl << be_nl;
+  *os << be_uidt_nl << "};" << be_nl;
   *os << be_nl
       << "//" << be_nl
       << "//                ThruPOA  Proxy Impl. Declaration" << be_nl
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 fbe7e1e7336..e12ca741dbe 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -44,46 +44,49 @@ be_visitor_interface_tie_sh::~be_visitor_interface_tie_sh (void)
 int
 be_visitor_interface_tie_sh::visit_interface (be_interface *node)
 {
-  TAO_OutStream *os; // output stream
-  static char namebuf [NAMEBUFSIZE]; // holds the class name
-  static char tiename [NAMEBUFSIZE]; // holds the tie name
+  static char namebuf [NAMEBUFSIZE];
+  static char tiename [NAMEBUFSIZE];
 
-  if (node->srv_hdr_gen () || node->imported ())
-    return 0;
+  if (node->imported ())
+    {
+      return 0;
+    }
 
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::memset (tiename, '\0', NAMEBUFSIZE);
+  ACE_OS::memset (namebuf, 
+                  '\0', 
+                  NAMEBUFSIZE);
+  ACE_OS::memset (tiename, 
+                  '\0', 
+                  NAMEBUFSIZE);
 
-  os = this->ctx_->stream ();
+  TAO_OutStream *os = this->ctx_->stream ();
 
-  // generate the skeleton class name which will be used to determine the TIE
-  // class name
+  // Generate the skeleton class name which will be used to determine the TIE
+  // class name.
 
-  // we shall have a POA_ prefix only if we are at the topmost level
-  if (!node->is_nested ())
+  // We shall have a POA_ prefix only if we are at the topmost level.
+  if (node->is_nested ())
     {
-      // we are outermost
-      ACE_OS::sprintf (namebuf, "POA_%s", node->local_name ());
-      ACE_OS::sprintf (tiename, "POA_%s_tie",
+      ACE_OS::sprintf (namebuf, 
+                       "%s", 
+                       node->local_name ());
+      ACE_OS::sprintf (tiename, 
+                       "%s_tie",
                        node->local_name ());
     }
   else
     {
-      ACE_OS::sprintf (namebuf, "%s", node->local_name ());
-      ACE_OS::sprintf (tiename, "%s_tie",
+      // We are outermost.
+      ACE_OS::sprintf (namebuf, 
+                       "POA_%s", 
+                       node->local_name ());
+      ACE_OS::sprintf (tiename, 
+                       "POA_%s_tie",
                        node->local_name ());
     }
 
-  // now generate the class definition
-  os->indent (); // start with whatever indentation level we are at
-
-  // Since templates nested inside of classes are broken on most C++ compilers,
-  // we generate code for this inside a conditional macro. The code is
-  // activated only if "namespaces" are supported on the platform
-  if (node->is_nested ())
-    {
-      *os << "\n#if defined (ACE_HAS_USING_KEYWORD)" << be_nl;
-    }
+  // Now generate the class definition.
+  os->indent ();
 
   *os << "// TIE class: Refer to CORBA v2.2, Section 20.34.4" << be_nl;
   *os << "template <class T>" << be_nl;
@@ -120,19 +123,20 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << be_uidt << be_uidt_nl
       << ");" << be_uidt << "\n";
 
+  if (node->traverse_inheritance_graph (
+                be_visitor_interface_tie_sh::method_helper, 
+                os
+              ) == -1)
     {
-      if (node->traverse_inheritance_graph (be_visitor_interface_tie_sh::method_helper, os) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_interface_tie_sh_ss::"
-                             "visit_interface - "
-                             "traversal of inhertance graph failed\n"),
-                            -1);
-        }
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_tie_sh_ss::"
+                         "visit_interface - "
+                         "traversal of inhertance graph failed\n"),
+                        -1);
     }
 
-
-  *os << be_uidt << "private:" << be_idt_nl
+  os->decr_indent (1);
+  *os << "private:" << be_idt_nl
       << "T *ptr_;" << be_nl
       << "PortableServer::POA_var poa_;" << be_nl
       << "CORBA::Boolean rel_;" << be_nl << be_nl
@@ -141,24 +145,20 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "void operator= (const " << tiename << " &);" << be_uidt_nl
       << "};\n\n";
 
-  if (node->is_nested ())
-    {
-      *os << "#endif /* ACE_HAS_USING_KEYWORD */\n";
-    }
-
   return 0;
 }
 
 int
 be_visitor_interface_tie_sh::method_helper (be_interface *,
-					    be_interface *node,
-					    TAO_OutStream *os)
+					                                  be_interface *node,
+					                                  TAO_OutStream *os)
 {
   be_visitor_context ctx;
   ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SH);
 
   ctx.stream (os);
   be_visitor* visitor = tao_cg->make_visitor (&ctx);
+
   if (visitor == 0 || visitor->visit_scope (node) == -1)
     {
       delete visitor;
@@ -166,6 +166,7 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
 			 "be_visitor_interface_tie_sh::"
 			 "method_helper\n"), -1);
     }
+
   delete visitor;
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
index ed9e487ffa8..05439f43efb 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -78,11 +78,6 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
                        node->local_name ());
     }
 
-  if (node->is_nested ())
-    {
-      *os << "\n#if defined (ACE_HAS_USING_KEYWORD)\n";
-    }
-
   os->indent (); // start with whatever indentation level we are at
 
   *os << "template <class T> ACE_INLINE" << be_nl
@@ -179,11 +174,6 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
                         -1);
     }
 
-  if (node->is_nested ())
-    {
-      *os << "#endif /* ACE_HAS_USING_KEYWORD */\n";
-    }
-
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
index 40c3b1d98ca..18b70f9237c 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
@@ -42,29 +42,33 @@ be_visitor_module_sh::~be_visitor_module_sh (void)
 int
 be_visitor_module_sh::visit_module (be_module *node)
 {
-  TAO_OutStream *os; // output stream
+  TAO_OutStream *os;
 
-  if (!node->srv_hdr_gen () && !node->imported ()) // not generated and not imported
+  // Not generated and not imported.
+  if (!node->srv_hdr_gen () && !node->imported ()) 
     {
       os = this->ctx_->stream ();
 
-      // generate the skeleton class name
+      // Generate the skeleton class name.
 
-      os->indent (); // start with whatever indentation level we are at
+      os->indent ();
 
-      // now generate the class definition. The prefix POA_ is prepended to our
-      // name only if we are the outermost module
-      *os << "TAO_NAMESPACE "; // << idl_global->skel_export_macro ()
+      // Now generate the class definition. The prefix POA_ is prepended to our
+      // name only if we are the outermost module.
+      *os << "TAO_NAMESPACE ";
 
       if (!node->is_nested ())
-          // we are outermost module
+        {
+          // We are outermost module.
           *os << " POA_" << node->local_name () << be_nl;
+        }
       else
-          // we are inside another module
+        {
+          // We are inside another module.
           *os << " " << node->local_name () << be_nl;
+        }
 
-      *os << "{" << be_nl
-          << be_idt;
+      *os << "{\n" << be_idt;
 
       if (this->visit_scope (node) == -1)
         {
@@ -75,8 +79,10 @@ be_visitor_module_sh::visit_module (be_module *node)
         }
 
       os->decr_indent ();
-      *os << "}\nTAO_NAMESPACE_CLOSE\n\n";
+      *os << "}" << be_nl << "TAO_NAMESPACE_CLOSE // module " 
+          << node->name () << "\n\n";
     }
+
   return 0;
 
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index 6fe97853560..d7e00029d36 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -26,8 +26,6 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node)
   os = this->ctx_->stream ();
   this->ctx_->node (node); // save the node
 
-  os->indent (); // start with the current indentation level
-
   // every operation is declared virtual in the client code
   *os << "virtual ";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp
index 770f575be95..6521d5d8535 100644
--- a/TAO/TAO_IDL/be/be_visitor_root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root.cpp
@@ -29,6 +29,7 @@
 #include "be_visitor_root/root_sh.cpp"
 #include "be_visitor_root/root_si.cpp"
 #include "be_visitor_root/root_ss.cpp"
+#include "be_visitor_root/root_sth.cpp"
 #include "be_visitor_root/root_is.cpp"
 #include "be_visitor_root/root_ih.cpp"
 #include "be_visitor_root/any_op.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 620cb1ed224..818ac16b87a 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -64,7 +64,6 @@ int be_visitor_root::visit_root (be_root *node)
                          "codegen for scope failed\n"), -1);
     }
 
-
   // If we are generating the client header file, this is the place to
   // generate the proxy broker factory function pointer declarations
   // and the extern declarations for non-defined interfaces.
@@ -214,20 +213,18 @@ int be_visitor_root::visit_root (be_root *node)
       break;
     case TAO_CodeGen::TAO_ROOT_SH:
       (void) tao_cg->end_server_header ();
-
-      if (be_global->gen_tie_classes ())
-        {
-          (void) tao_cg->end_server_template_header ();
-        }
-
       return 0;
-
     case TAO_CodeGen::TAO_ROOT_CI:
       break;
     case TAO_CodeGen::TAO_ROOT_IS:
       break;
     case TAO_CodeGen::TAO_ROOT_SI:
-      return 0; // nothing to be done
+      if (be_global->gen_tie_classes ())
+        {
+          (void) tao_cg->end_server_template_inline ();
+        }
+
+      return 0;
     case TAO_CodeGen::TAO_ROOT_SS:
       if (be_global->gen_tie_classes ())
         {
@@ -235,7 +232,14 @@ int be_visitor_root::visit_root (be_root *node)
         }
 
       (void) tao_cg->end_server_skeletons ();
-      return 0; // nothing to be done
+      return 0;
+    case TAO_CodeGen::TAO_ROOT_TIE_SH:
+      if (be_global->gen_tie_classes ())
+        {
+          (void) tao_cg->end_server_template_header ();
+        }
+
+      return 0;
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -296,6 +300,7 @@ int be_visitor_root::visit_root (be_root *node)
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
     case TAO_CodeGen::TAO_ROOT_IS:
+    case TAO_CodeGen::TAO_ROOT_TIE_SH:
       return 0; // nothing to be done
     default:
       {
@@ -798,6 +803,7 @@ be_visitor_root::visit_valuetype (be_valuetype *node)
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
     case TAO_CodeGen::TAO_ROOT_IS:
+    case TAO_CodeGen::TAO_ROOT_TIE_SH:
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
       return 0;    // nothing to do, resp. not yet impl.
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
index 235f91da26a..3443aa6fac7 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
@@ -47,32 +47,18 @@ be_visitor_root_sh::init (void)
   if (tao_cg->start_server_header (be_global->be_get_server_hdr_fname ())
         == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root_sh::init - "
-                         "Error :%p: Unable to open server header file : %s\n",
-                         "start_server_header",
-                         be_global->be_get_server_hdr_fname ()),
-                        -1);
+      ACE_ERROR_RETURN ((
+          LM_ERROR,
+          "(%N:%l) be_visitor_root_sh::init - "
+          "Error :%p: Unable to open server header file : %s\n",
+          "start_server_header",
+          be_global->be_get_server_hdr_fname ()
+        ),
+        -1
+      );
     }
 
-  if (be_global->gen_tie_classes ())
-    {
-      if (tao_cg->start_server_template_header (
-              be_global->be_get_server_template_hdr_fname ()
-            )
-          == -1)
-        {
-          ACE_ERROR_RETURN ((
-              LM_ERROR,
-              "(%N:%l) be_visitor_root_sh::init - "
-              "Error:Unable to openin server template header file : %s\n",
-              be_global->be_get_server_template_hdr_fname ()
-            ), 
-            -1
-          );
-        }
-    }
-  // set the stream and the next state
+  // set the stream and the next state.
   this->ctx_->stream (tao_cg->server_header ());
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
new file mode 100644
index 00000000000..6d5b615bf3f
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -0,0 +1,203 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_sth.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the server template header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_root.h"
+#include "be_visitor_interface.h"
+
+ACE_RCSID(be_visitor_root, root_sth, "$Id$")
+
+
+// ****************************************
+// Root visitor for server template header
+// ****************************************
+
+be_visitor_root_sth::be_visitor_root_sth (be_visitor_context *ctx)
+  : be_visitor_root (ctx)
+{
+}
+
+be_visitor_root_sth::~be_visitor_root_sth (void)
+{
+}
+
+int
+be_visitor_root_sth::init (void)
+{
+  // Open the file.
+  if (tao_cg->start_server_template_header (
+          be_global->be_get_server_template_hdr_fname ()
+        )
+      == -1)
+    {
+      ACE_ERROR_RETURN ((
+          LM_ERROR,
+          "(%N:%l) be_visitor_root_sth::init - "
+          "Error:Unable to open server template header file : %s\n",
+          be_global->be_get_server_template_hdr_fname ()
+        ), 
+        -1
+      );
+    }
+
+  // Set the stream and the next state.
+  this->ctx_->stream (tao_cg->server_template_header ());
+  return 0;
+}
+
+int
+be_visitor_root_sth::visit_scope (be_scope *node)
+{
+  // Proceed if the number of members in our scope is greater than 0.
+  if (node->nmembers () > 0)
+    {
+      // Initialize an iterator to iterate over our scope.
+      UTL_ScopeActiveIterator si (node,
+                                  UTL_Scope::IK_decls);
+      // Continue until each element is visited.
+      while (!si.is_done ())
+        {
+          AST_Decl *d = si.item ();
+
+          if (d == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_root_sth::visit_scope - "
+                                 "bad node in this scope\n"), 
+                                -1);
+
+            }
+
+          AST_Decl::NodeType nt = d->node_type ();
+
+          // These are the onlh types we're interested in.
+          if (nt != AST_Decl::NT_module
+              && nt != AST_Decl::NT_interface)
+            {
+              si.next ();
+              continue;
+            }
+
+          be_decl *bd = be_decl::narrow_from_decl (d);
+
+          // Set the scope node as "node" in which the code is being
+          // generated so that elements in the node's scope can use it
+          // for code generation.
+          this->ctx_->scope (node->decl ());
+
+          // Set the node to be visited.
+          this->ctx_->node (bd);
+
+          // Send the visitor.
+          if (bd == 0 || bd->accept (this) == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "(%N:%l) be_visitor_root_sth::visit_scope - "
+                                 "codegen for scope failed\n"), 
+                                -1);
+
+            }
+
+          si.next ();
+        } // End of while loop.
+    } // End of if.
+
+  return 0;
+}
+
+int
+be_visitor_root_sth::visit_module (be_module *node)
+{
+  if (node->imported ())
+    {
+      return 0;
+    }
+
+  TAO_OutStream *os = tao_cg->server_template_header ();
+
+  // Generate the skeleton class name.
+
+  os->indent ();
+
+  // Now generate the class definition. The prefix POA_ is prepended to our
+  // name only if we are the outermost module.
+  *os << "TAO_NAMESPACE ";
+
+  if (node->is_nested ())
+    {
+      // We are inside another module.
+      *os << " " << node->local_name () << be_nl;
+    }
+  else
+    {
+      // We are outermost module.
+      *os << " POA_" << node->local_name () << be_nl;
+    }
+
+  *os << "{\n" << be_idt;
+
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_root_sth::"
+                         "visit_module - "
+                         "codegen for scope failed\n"), 
+                         -1);
+    }
+
+  os->decr_indent ();
+  *os << "}" << be_nl << "TAO_NAMESPACE_CLOSE // module " 
+      << node->name () << "\n\n";
+
+  return 0;
+}
+
+int
+be_visitor_root_sth::visit_interface (be_interface *node)
+{
+  if (node->imported () || node->is_local ())
+    {
+      return 0;
+    }
+
+  // Generate the TIE class.
+
+  this->ctx_->state (TAO_CodeGen::TAO_INTERFACE_TIE_SH); 
+  this->ctx_->node (node);
+
+  be_visitor_interface_tie_sh visitor (this->ctx_);
+
+  if (node->accept (&visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_root_sth::"
+                         "visit_interface - "
+                         "codegen for TIE class failed\n"),
+                        -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 e41f56d0687..829795d65ed 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -402,6 +402,7 @@ public:
     TAO_ROOT_SH,
     TAO_ROOT_SI,
     TAO_ROOT_SS,
+    TAO_ROOT_TIE_SH,
     TAO_ROOT_IH,
     TAO_ROOT_IS,
     TAO_ROOT_ANY_OP_CH,
@@ -601,6 +602,9 @@ 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.
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root.h b/TAO/TAO_IDL/be_include/be_visitor_root.h
index 6729b160008..3c304af0a9e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root.h
@@ -32,6 +32,7 @@
 #include "be_visitor_root/root_sh.h"
 #include "be_visitor_root/root_si.h"
 #include "be_visitor_root/root_ss.h"
+#include "be_visitor_root/root_sth.h"
 #include "be_visitor_root/root_is.h"
 #include "be_visitor_root/root_ih.h"
 #include "be_visitor_root/any_op.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h
new file mode 100644
index 00000000000..e99caffd6a6
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_sth.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    server template header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_ROOT_ROOT_STH_H_
+#define _BE_VISITOR_ROOT_ROOT_STH_H_
+
+class be_visitor_root_sth : public be_visitor_root
+{
+  //
+  // = TITLE
+  //   be_visitor_root_sth
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server template 
+  //   header for root.
+  //
+  //
+public:
+  be_visitor_root_sth (be_visitor_context *ctx);
+  // Constructor.
+
+  ~be_visitor_root_sth (void);
+  // Destructor.
+
+  virtual int init (void);
+  // Set the right context and make a visitor.
+
+  // Overrides of base class methods so we can skip unnecessary nodes.
+
+  virtual int visit_scope (be_scope *node);
+
+  virtual int visit_module (be_module *node);
+
+  virtual int visit_interface (be_interface *node);
+};
+
+#endif /* _BE_VISITOR_ROOT_ROOT_STH_H_ */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
index 98cc954ac43..f4e14a7c3a3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
@@ -230,66 +230,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_IRObject_tie : public POA_CORBA_IRObject
-{
-public:
-  POA_CORBA_IRObject_tie (T &t);
-  // the T& ctor
-  POA_CORBA_IRObject_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_IRObject_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_IRObject_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_IRObject_tie (const POA_CORBA_IRObject_tie &);
-  void operator= (const POA_CORBA_IRObject_tie &);
-};
-
-
 class POA_CORBA_Contained;
 typedef POA_CORBA_Contained *POA_CORBA_Contained_ptr;
 // Forward Classes Declaration
@@ -720,160 +660,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_Contained_tie : public POA_CORBA_Contained
-{
-public:
-  POA_CORBA_Contained_tie (T &t);
-  // the T& ctor
-  POA_CORBA_Contained_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_Contained_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_Contained_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_Contained_tie (const POA_CORBA_Contained_tie &);
-  void operator= (const POA_CORBA_Contained_tie &);
-};
-
-
 class POA_CORBA_Container;
 typedef POA_CORBA_Container *POA_CORBA_Container_ptr;
 // Forward Classes Declaration
@@ -1572,270 +1358,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_Container_tie : public POA_CORBA_Container
-{
-public:
-  POA_CORBA_Container_tie (T &t);
-  // the T& ctor
-  POA_CORBA_Container_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_Container_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_Container_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_Container_tie (const POA_CORBA_Container_tie &);
-  void operator= (const POA_CORBA_Container_tie &);
-};
-
-
 class POA_CORBA_IDLType;
 typedef POA_CORBA_IDLType *POA_CORBA_IDLType_ptr;
 // Forward Classes Declaration
@@ -2014,74 +1536,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_IDLType_tie : public POA_CORBA_IDLType
-{
-public:
-  POA_CORBA_IDLType_tie (T &t);
-  // the T& ctor
-  POA_CORBA_IDLType_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_IDLType_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_IDLType_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_IDLType_tie (const POA_CORBA_IDLType_tie &);
-  void operator= (const POA_CORBA_IDLType_tie &);
-};
-
-
 class POA_CORBA_TypedefDef;
 typedef POA_CORBA_TypedefDef *POA_CORBA_TypedefDef_ptr;
 // Forward Classes Declaration
@@ -2333,168 +1787,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_TypedefDef_tie : public POA_CORBA_TypedefDef
-{
-public:
-  POA_CORBA_TypedefDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_TypedefDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_TypedefDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_TypedefDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_TypedefDef_tie (const POA_CORBA_TypedefDef_tie &);
-  void operator= (const POA_CORBA_TypedefDef_tie &);
-};
-
-
 #include "IFR_BaseS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
index 20261361d0d..d0b0f3d4a9e 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_T_H_
-#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_T_H_
+#ifndef _TAO_IDL_IFR_BASES_T_H_
+#define _TAO_IDL_IFR_BASES_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -30,6 +30,717 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
+TAO_NAMESPACE  POA_CORBA
+{
+}
+TAO_NAMESPACE_CLOSE // module CORBA
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_IRObject_tie : public POA_CORBA_IRObject
+{
+public:
+  POA_CORBA_IRObject_tie (T &t);
+  // the T& ctor
+  POA_CORBA_IRObject_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_IRObject_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_IRObject_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_IRObject_tie (const POA_CORBA_IRObject_tie &);
+  void operator= (const POA_CORBA_IRObject_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_Contained_tie : public POA_CORBA_Contained
+{
+public:
+  POA_CORBA_Contained_tie (T &t);
+  // the T& ctor
+  POA_CORBA_Contained_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_Contained_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_Contained_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_Contained_tie (const POA_CORBA_Contained_tie &);
+  void operator= (const POA_CORBA_Contained_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_Container_tie : public POA_CORBA_Container
+{
+public:
+  POA_CORBA_Container_tie (T &t);
+  // the T& ctor
+  POA_CORBA_Container_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_Container_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_Container_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_Container_tie (const POA_CORBA_Container_tie &);
+  void operator= (const POA_CORBA_Container_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_IDLType_tie : public POA_CORBA_IDLType
+{
+public:
+  POA_CORBA_IDLType_tie (T &t);
+  // the T& ctor
+  POA_CORBA_IDLType_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_IDLType_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_IDLType_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_IDLType_tie (const POA_CORBA_IDLType_tie &);
+  void operator= (const POA_CORBA_IDLType_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_TypedefDef_tie : public POA_CORBA_TypedefDef
+{
+public:
+  POA_CORBA_TypedefDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_TypedefDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_TypedefDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_TypedefDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_TypedefDef_tie (const POA_CORBA_TypedefDef_tie &);
+  void operator= (const POA_CORBA_TypedefDef_tie &);
+};
+
+#endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BaseS_T.i"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
index 70070affc11..c2619822298 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
@@ -19,6 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T &t)
 	: ptr_ (&t),
@@ -1227,3 +1229,4 @@ ACE_TRY_ENV
   );
 }
 
+#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
index 4c166fc3f71..85784c36341 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
@@ -551,345 +551,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_Repository_tie : public POA_CORBA_Repository
-{
-public:
-  POA_CORBA_Repository_tie (T &t);
-  // the T& ctor
-  POA_CORBA_Repository_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_Repository_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_Repository_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_Contained_ptr lookup_id (
-      const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StringDef_ptr create_string (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_WstringDef_ptr create_wstring (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_SequenceDef_ptr create_sequence (
-      CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ArrayDef_ptr create_array (
-      CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_FixedDef_ptr create_fixed (
-      CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_Repository_tie (const POA_CORBA_Repository_tie &);
-  void operator= (const POA_CORBA_Repository_tie &);
-};
-
-
 class POA_CORBA_ModuleDef;
 typedef POA_CORBA_ModuleDef *POA_CORBA_ModuleDef_ptr;
 // Forward Classes Declaration
@@ -1269,364 +930,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_ModuleDef_tie : public POA_CORBA_ModuleDef
-{
-public:
-  POA_CORBA_ModuleDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ModuleDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ModuleDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ModuleDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_ModuleDef_tie (const POA_CORBA_ModuleDef_tie &);
-  void operator= (const POA_CORBA_ModuleDef_tie &);
-};
-
-
 class POA_CORBA_ConstantDef;
 typedef POA_CORBA_ConstantDef *POA_CORBA_ConstantDef_ptr;
 // Forward Classes Declaration
@@ -1993,202 +1296,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_ConstantDef_tie : public POA_CORBA_ConstantDef
-{
-public:
-  POA_CORBA_ConstantDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ConstantDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ConstantDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ConstantDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Any * value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void value (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_ConstantDef_tie (const POA_CORBA_ConstantDef_tie &);
-  void operator= (const POA_CORBA_ConstantDef_tie &);
-};
-
-
 class POA_CORBA_StructDef;
 typedef POA_CORBA_StructDef *POA_CORBA_StructDef_ptr;
 // Forward Classes Declaration
@@ -2626,389 +1733,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_StructDef_tie : public POA_CORBA_StructDef
-{
-public:
-  POA_CORBA_StructDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_StructDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_StructDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_StructDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_StructDef_tie (const POA_CORBA_StructDef_tie &);
-  void operator= (const POA_CORBA_StructDef_tie &);
-};
-
-
 class POA_CORBA_UnionDef;
 typedef POA_CORBA_UnionDef *POA_CORBA_UnionDef_ptr;
 // Forward Classes Declaration
@@ -3520,414 +2244,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_UnionDef_tie : public POA_CORBA_UnionDef
-{
-public:
-  POA_CORBA_UnionDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_UnionDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_UnionDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_UnionDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void discriminator_type_def (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void members (
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_UnionDef_tie (const POA_CORBA_UnionDef_tie &);
-  void operator= (const POA_CORBA_UnionDef_tie &);
-};
-
-
 class POA_CORBA_EnumDef;
 typedef POA_CORBA_EnumDef *POA_CORBA_EnumDef_ptr;
 // Forward Classes Declaration
@@ -4228,185 +2544,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_EnumDef_tie : public POA_CORBA_EnumDef
-{
-public:
-  POA_CORBA_EnumDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_EnumDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_EnumDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_EnumDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_EnumMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void members (
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_EnumDef_tie (const POA_CORBA_EnumDef_tie &);
-  void operator= (const POA_CORBA_EnumDef_tie &);
-};
-
-
 class POA_CORBA_AliasDef;
 typedef POA_CORBA_AliasDef *POA_CORBA_AliasDef_ptr;
 // Forward Classes Declaration
@@ -4707,185 +2844,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_AliasDef_tie : public POA_CORBA_AliasDef
-{
-public:
-  POA_CORBA_AliasDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_AliasDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_AliasDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_AliasDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_AliasDef_tie (const POA_CORBA_AliasDef_tie &);
-  void operator= (const POA_CORBA_AliasDef_tie &);
-};
-
-
 class POA_CORBA_NativeDef;
 typedef POA_CORBA_NativeDef *POA_CORBA_NativeDef_ptr;
 // Forward Classes Declaration
@@ -5136,168 +3094,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_NativeDef_tie : public POA_CORBA_NativeDef
-{
-public:
-  POA_CORBA_NativeDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_NativeDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_NativeDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_NativeDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_NativeDef_tie (const POA_CORBA_NativeDef_tie &);
-  void operator= (const POA_CORBA_NativeDef_tie &);
-};
-
-
 class POA_CORBA_PrimitiveDef;
 typedef POA_CORBA_PrimitiveDef *POA_CORBA_PrimitiveDef_ptr;
 // Forward Classes Declaration
@@ -5484,82 +3280,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_PrimitiveDef_tie : public POA_CORBA_PrimitiveDef
-{
-public:
-  POA_CORBA_PrimitiveDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_PrimitiveDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_PrimitiveDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_PrimitiveDef_tie (const POA_CORBA_PrimitiveDef_tie &);
-  void operator= (const POA_CORBA_PrimitiveDef_tie &);
-};
-
-
 class POA_CORBA_StringDef;
 typedef POA_CORBA_StringDef *POA_CORBA_StringDef_ptr;
 // Forward Classes Declaration
@@ -5772,91 +3492,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_StringDef_tie : public POA_CORBA_StringDef
-{
-public:
-  POA_CORBA_StringDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_StringDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_StringDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_StringDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_StringDef_tie (const POA_CORBA_StringDef_tie &);
-  void operator= (const POA_CORBA_StringDef_tie &);
-};
-
-
 class POA_CORBA_WstringDef;
 typedef POA_CORBA_WstringDef *POA_CORBA_WstringDef_ptr;
 // Forward Classes Declaration
@@ -6069,91 +3704,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_WstringDef_tie : public POA_CORBA_WstringDef
-{
-public:
-  POA_CORBA_WstringDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_WstringDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_WstringDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_WstringDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_WstringDef_tie (const POA_CORBA_WstringDef_tie &);
-  void operator= (const POA_CORBA_WstringDef_tie &);
-};
-
-
 class POA_CORBA_SequenceDef;
 typedef POA_CORBA_SequenceDef *POA_CORBA_SequenceDef_ptr;
 // Forward Classes Declaration
@@ -6440,116 +3990,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_SequenceDef_tie : public POA_CORBA_SequenceDef
-{
-public:
-  POA_CORBA_SequenceDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_SequenceDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_SequenceDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_SequenceDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_SequenceDef_tie (const POA_CORBA_SequenceDef_tie &);
-  void operator= (const POA_CORBA_SequenceDef_tie &);
-};
-
-
 class POA_CORBA_ArrayDef;
 typedef POA_CORBA_ArrayDef *POA_CORBA_ArrayDef_ptr;
 // Forward Classes Declaration
@@ -6836,116 +4276,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_ArrayDef_tie : public POA_CORBA_ArrayDef
-{
-public:
-  POA_CORBA_ArrayDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ArrayDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ArrayDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ArrayDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_ArrayDef_tie (const POA_CORBA_ArrayDef_tie &);
-  void operator= (const POA_CORBA_ArrayDef_tie &);
-};
-
-
 class POA_CORBA_ExceptionDef;
 typedef POA_CORBA_ExceptionDef *POA_CORBA_ExceptionDef_ptr;
 // Forward Classes Declaration
@@ -7399,389 +4729,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_ExceptionDef_tie : public POA_CORBA_ExceptionDef
-{
-public:
-  POA_CORBA_ExceptionDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ExceptionDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ExceptionDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ExceptionDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_ExceptionDef_tie (const POA_CORBA_ExceptionDef_tie &);
-  void operator= (const POA_CORBA_ExceptionDef_tie &);
-};
-
-
 class POA_CORBA_AttributeDef;
 typedef POA_CORBA_AttributeDef *POA_CORBA_AttributeDef_ptr;
 // Forward Classes Declaration
@@ -8148,202 +5095,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_AttributeDef_tie : public POA_CORBA_AttributeDef
-{
-public:
-  POA_CORBA_AttributeDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_AttributeDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_AttributeDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_AttributeDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::AttributeMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void mode (
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_AttributeDef_tie (const POA_CORBA_AttributeDef_tie &);
-  void operator= (const POA_CORBA_AttributeDef_tie &);
-};
-
-
 class POA_CORBA_OperationDef;
 typedef POA_CORBA_OperationDef *POA_CORBA_OperationDef_ptr;
 // Forward Classes Declaration
@@ -8860,253 +5611,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_OperationDef_tie : public POA_CORBA_OperationDef
-{
-public:
-  POA_CORBA_OperationDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_OperationDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_OperationDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_OperationDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void params (
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void contexts (
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void exceptions (
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_OperationDef_tie (const POA_CORBA_OperationDef_tie &);
-  void operator= (const POA_CORBA_OperationDef_tie &);
-};
-
-
 class POA_CORBA_InterfaceDef;
 typedef POA_CORBA_InterfaceDef *POA_CORBA_InterfaceDef_ptr;
 // Forward Classes Declaration
@@ -9669,435 +6173,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_InterfaceDef_tie : public POA_CORBA_InterfaceDef
-{
-public:
-  POA_CORBA_InterfaceDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_InterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_InterfaceDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_InterfaceDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AttributeDef_ptr create_attribute (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_OperationDef_ptr create_operation (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_InterfaceDef_tie (const POA_CORBA_InterfaceDef_tie &);
-  void operator= (const POA_CORBA_InterfaceDef_tie &);
-};
-
-
 class POA_CORBA_AbstractInterfaceDef;
 typedef POA_CORBA_AbstractInterfaceDef *POA_CORBA_AbstractInterfaceDef_ptr;
 // Forward Classes Declaration
@@ -10532,435 +6607,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_AbstractInterfaceDef_tie : public POA_CORBA_AbstractInterfaceDef
-{
-public:
-  POA_CORBA_AbstractInterfaceDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_AbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_AbstractInterfaceDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AttributeDef_ptr create_attribute (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_OperationDef_ptr create_operation (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_AbstractInterfaceDef_tie (const POA_CORBA_AbstractInterfaceDef_tie &);
-  void operator= (const POA_CORBA_AbstractInterfaceDef_tie &);
-};
-
-
 class POA_CORBA_LocalInterfaceDef;
 typedef POA_CORBA_LocalInterfaceDef *POA_CORBA_LocalInterfaceDef_ptr;
 // Forward Classes Declaration
@@ -11395,435 +7041,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_LocalInterfaceDef_tie : public POA_CORBA_LocalInterfaceDef
-{
-public:
-  POA_CORBA_LocalInterfaceDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_LocalInterfaceDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_LocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_LocalInterfaceDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AttributeDef_ptr create_attribute (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_OperationDef_ptr create_operation (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_LocalInterfaceDef_tie (const POA_CORBA_LocalInterfaceDef_tie &);
-  void operator= (const POA_CORBA_LocalInterfaceDef_tie &);
-};
-
-
 #include "IFR_BasicS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
index f8f6673d3a3..a55e369fc17 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_T_H_
-#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_T_H_
+#ifndef _TAO_IDL_IFR_BASICS_T_H_
+#define _TAO_IDL_IFR_BASICS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -30,6 +30,4778 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
+TAO_NAMESPACE  POA_CORBA
+{
+}
+TAO_NAMESPACE_CLOSE // module CORBA
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_Repository_tie : public POA_CORBA_Repository
+{
+public:
+  POA_CORBA_Repository_tie (T &t);
+  // the T& ctor
+  POA_CORBA_Repository_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_Repository_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_Repository_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_Contained_ptr lookup_id (
+      const char * search_id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr get_canonical_typecode (
+      CORBA::TypeCode_ptr tc,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_PrimitiveDef_ptr get_primitive (
+      CORBA::PrimitiveKind kind,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StringDef_ptr create_string (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_WstringDef_ptr create_wstring (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_SequenceDef_ptr create_sequence (
+      CORBA::ULong bound,
+      CORBA_IDLType_ptr element_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ArrayDef_ptr create_array (
+      CORBA::ULong length,
+      CORBA_IDLType_ptr element_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_FixedDef_ptr create_fixed (
+      CORBA::UShort digits,
+      CORBA::Short scale,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_Repository_tie (const POA_CORBA_Repository_tie &);
+  void operator= (const POA_CORBA_Repository_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_ModuleDef_tie : public POA_CORBA_ModuleDef
+{
+public:
+  POA_CORBA_ModuleDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ModuleDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ModuleDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ModuleDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_ModuleDef_tie (const POA_CORBA_ModuleDef_tie &);
+  void operator= (const POA_CORBA_ModuleDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_ConstantDef_tie : public POA_CORBA_ConstantDef
+{
+public:
+  POA_CORBA_ConstantDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ConstantDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ConstantDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ConstantDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_IDLType_ptr type_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void type_def (
+      CORBA_IDLType_ptr type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Any * value (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void value (
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_ConstantDef_tie (const POA_CORBA_ConstantDef_tie &);
+  void operator= (const POA_CORBA_ConstantDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_StructDef_tie : public POA_CORBA_StructDef
+{
+public:
+  POA_CORBA_StructDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_StructDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_StructDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_StructDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_StructMemberSeq * members (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void members (
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_StructDef_tie (const POA_CORBA_StructDef_tie &);
+  void operator= (const POA_CORBA_StructDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_UnionDef_tie : public POA_CORBA_UnionDef
+{
+public:
+  POA_CORBA_UnionDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_UnionDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_UnionDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_UnionDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::TypeCode_ptr discriminator_type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_IDLType_ptr discriminator_type_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void discriminator_type_def (
+      CORBA_IDLType_ptr discriminator_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionMemberSeq * members (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void members (
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_UnionDef_tie (const POA_CORBA_UnionDef_tie &);
+  void operator= (const POA_CORBA_UnionDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_EnumDef_tie : public POA_CORBA_EnumDef
+{
+public:
+  POA_CORBA_EnumDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_EnumDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_EnumDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_EnumDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_EnumMemberSeq * members (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void members (
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_EnumDef_tie (const POA_CORBA_EnumDef_tie &);
+  void operator= (const POA_CORBA_EnumDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_AliasDef_tie : public POA_CORBA_AliasDef
+{
+public:
+  POA_CORBA_AliasDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_AliasDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_AliasDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_AliasDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_IDLType_ptr original_type_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void original_type_def (
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_AliasDef_tie (const POA_CORBA_AliasDef_tie &);
+  void operator= (const POA_CORBA_AliasDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_NativeDef_tie : public POA_CORBA_NativeDef
+{
+public:
+  POA_CORBA_NativeDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_NativeDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_NativeDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_NativeDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_NativeDef_tie (const POA_CORBA_NativeDef_tie &);
+  void operator= (const POA_CORBA_NativeDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_PrimitiveDef_tie : public POA_CORBA_PrimitiveDef
+{
+public:
+  POA_CORBA_PrimitiveDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_PrimitiveDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_PrimitiveDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::PrimitiveKind kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_PrimitiveDef_tie (const POA_CORBA_PrimitiveDef_tie &);
+  void operator= (const POA_CORBA_PrimitiveDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_StringDef_tie : public POA_CORBA_StringDef
+{
+public:
+  POA_CORBA_StringDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_StringDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_StringDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_StringDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::ULong bound (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void bound (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_StringDef_tie (const POA_CORBA_StringDef_tie &);
+  void operator= (const POA_CORBA_StringDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_WstringDef_tie : public POA_CORBA_WstringDef
+{
+public:
+  POA_CORBA_WstringDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_WstringDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_WstringDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_WstringDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::ULong bound (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void bound (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_WstringDef_tie (const POA_CORBA_WstringDef_tie &);
+  void operator= (const POA_CORBA_WstringDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_SequenceDef_tie : public POA_CORBA_SequenceDef
+{
+public:
+  POA_CORBA_SequenceDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_SequenceDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_SequenceDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_SequenceDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::ULong bound (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void bound (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr element_type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_IDLType_ptr element_type_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void element_type_def (
+      CORBA_IDLType_ptr element_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_SequenceDef_tie (const POA_CORBA_SequenceDef_tie &);
+  void operator= (const POA_CORBA_SequenceDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_ArrayDef_tie : public POA_CORBA_ArrayDef
+{
+public:
+  POA_CORBA_ArrayDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ArrayDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ArrayDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ArrayDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::ULong length (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void length (
+      CORBA::ULong length,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr element_type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_IDLType_ptr element_type_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void element_type_def (
+      CORBA_IDLType_ptr element_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_ArrayDef_tie (const POA_CORBA_ArrayDef_tie &);
+  void operator= (const POA_CORBA_ArrayDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_ExceptionDef_tie : public POA_CORBA_ExceptionDef
+{
+public:
+  POA_CORBA_ExceptionDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ExceptionDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ExceptionDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ExceptionDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructMemberSeq * members (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void members (
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_ExceptionDef_tie (const POA_CORBA_ExceptionDef_tie &);
+  void operator= (const POA_CORBA_ExceptionDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_AttributeDef_tie : public POA_CORBA_AttributeDef
+{
+public:
+  POA_CORBA_AttributeDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_AttributeDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_AttributeDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_AttributeDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_IDLType_ptr type_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void type_def (
+      CORBA_IDLType_ptr type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::AttributeMode mode (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void mode (
+      CORBA::AttributeMode mode,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_AttributeDef_tie (const POA_CORBA_AttributeDef_tie &);
+  void operator= (const POA_CORBA_AttributeDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_OperationDef_tie : public POA_CORBA_OperationDef
+{
+public:
+  POA_CORBA_OperationDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_OperationDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_OperationDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_OperationDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::TypeCode_ptr result (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_IDLType_ptr result_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void result_def (
+      CORBA_IDLType_ptr result_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ParDescriptionSeq * params (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void params (
+      const CORBA_ParDescriptionSeq & params,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::OperationMode mode (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void mode (
+      CORBA::OperationMode mode,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContextIdSeq * contexts (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void contexts (
+      const CORBA_ContextIdSeq & contexts,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDefSeq * exceptions (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void exceptions (
+      const CORBA_ExceptionDefSeq & exceptions,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_OperationDef_tie (const POA_CORBA_OperationDef_tie &);
+  void operator= (const POA_CORBA_OperationDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_InterfaceDef_tie : public POA_CORBA_InterfaceDef
+{
+public:
+  POA_CORBA_InterfaceDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_InterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_InterfaceDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_InterfaceDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_InterfaceDefSeq * base_interfaces (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void base_interfaces (
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Boolean is_a (
+      const char * interface_id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AttributeDef_ptr create_attribute (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      CORBA::AttributeMode mode,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_OperationDef_ptr create_operation (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr result,
+      CORBA::OperationMode mode,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_InterfaceDef_tie (const POA_CORBA_InterfaceDef_tie &);
+  void operator= (const POA_CORBA_InterfaceDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_AbstractInterfaceDef_tie : public POA_CORBA_AbstractInterfaceDef
+{
+public:
+  POA_CORBA_AbstractInterfaceDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_AbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_AbstractInterfaceDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_InterfaceDefSeq * base_interfaces (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void base_interfaces (
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Boolean is_a (
+      const char * interface_id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AttributeDef_ptr create_attribute (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      CORBA::AttributeMode mode,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_OperationDef_ptr create_operation (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr result,
+      CORBA::OperationMode mode,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_AbstractInterfaceDef_tie (const POA_CORBA_AbstractInterfaceDef_tie &);
+  void operator= (const POA_CORBA_AbstractInterfaceDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_LocalInterfaceDef_tie : public POA_CORBA_LocalInterfaceDef
+{
+public:
+  POA_CORBA_LocalInterfaceDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_LocalInterfaceDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_LocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_LocalInterfaceDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_InterfaceDefSeq * base_interfaces (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void base_interfaces (
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Boolean is_a (
+      const char * interface_id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AttributeDef_ptr create_attribute (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      CORBA::AttributeMode mode,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_OperationDef_ptr create_operation (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr result,
+      CORBA::OperationMode mode,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_LocalInterfaceDef_tie (const POA_CORBA_LocalInterfaceDef_tie &);
+  void operator= (const POA_CORBA_LocalInterfaceDef_tie &);
+};
+
+#endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BasicS_T.i"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
index 7c424ecc9bf..9cb8f3e6fff 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
@@ -19,6 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T &t)
 	: ptr_ (&t),
@@ -8158,3 +8160,4 @@ ACE_TRY_ENV
   );
 }
 
+#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
index 719c035ee12..cc60386cd31 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
@@ -474,374 +474,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  ComponentRepository_tie : public ComponentRepository
-{
-public:
-  ComponentRepository_tie (T &t);
-  // the T& ctor
-  ComponentRepository_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  ComponentRepository_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  ComponentRepository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~ComponentRepository_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  IR::ComponentDef_ptr create_component (
-      const char * id,
-      const char * name,
-      const char * version,
-      IR::ComponentDef_ptr base_component,
-      const CORBA_InterfaceDefSeq & supports_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::HomeDef_ptr create_home (
-      const char * id,
-      const char * name,
-      const char * version,
-      IR::HomeDef_ptr base_home,
-      IR::ComponentDef_ptr managed_component,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup_id (
-      const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StringDef_ptr create_string (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_WstringDef_ptr create_wstring (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_SequenceDef_ptr create_sequence (
-      CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ArrayDef_ptr create_array (
-      CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_FixedDef_ptr create_fixed (
-      CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  ComponentRepository_tie (const ComponentRepository_tie &);
-  void operator= (const ComponentRepository_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class ProvidesDef;
 typedef ProvidesDef *ProvidesDef_ptr;
 // Forward Classes Declaration
@@ -1109,170 +741,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  ProvidesDef_tie : public ProvidesDef
-{
-public:
-  ProvidesDef_tie (T &t);
-  // the T& ctor
-  ProvidesDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  ProvidesDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  ProvidesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~ProvidesDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_InterfaceDef_ptr interface_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  ProvidesDef_tie (const ProvidesDef_tie &);
-  void operator= (const ProvidesDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class UsesDef;
 typedef UsesDef *UsesDef_ptr;
 // Forward Classes Declaration
@@ -1564,178 +1032,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  UsesDef_tie : public UsesDef
-{
-public:
-  UsesDef_tie (T &t);
-  // the T& ctor
-  UsesDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  UsesDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  UsesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~UsesDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_InterfaceDef_ptr interface_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_multiple (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  UsesDef_tie (const UsesDef_tie &);
-  void operator= (const UsesDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class EventDef;
 typedef EventDef *EventDef_ptr;
 // Forward Classes Declaration
@@ -2029,179 +1325,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  EventDef_tie : public EventDef
-{
-public:
-  EventDef_tie (T &t);
-  // the T& ctor
-  EventDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  EventDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  EventDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~EventDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::Boolean is_a (
-      const char * event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr event (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  EventDef_tie (const EventDef_tie &);
-  void operator= (const EventDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class EmitsDef;
 typedef EmitsDef *EmitsDef_ptr;
 // Forward Classes Declaration
@@ -2461,179 +1584,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  EmitsDef_tie : public EmitsDef
-{
-public:
-  EmitsDef_tie (T &t);
-  // the T& ctor
-  EmitsDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  EmitsDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  EmitsDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~EmitsDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::Boolean is_a (
-      const char * event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr event (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  EmitsDef_tie (const EmitsDef_tie &);
-  void operator= (const EmitsDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class PublishesDef;
 typedef PublishesDef *PublishesDef_ptr;
 // Forward Classes Declaration
@@ -2893,179 +1843,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  PublishesDef_tie : public PublishesDef
-{
-public:
-  PublishesDef_tie (T &t);
-  // the T& ctor
-  PublishesDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  PublishesDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  PublishesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~PublishesDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::Boolean is_a (
-      const char * event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr event (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  PublishesDef_tie (const PublishesDef_tie &);
-  void operator= (const PublishesDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class ConsumesDef;
 typedef ConsumesDef *ConsumesDef_ptr;
 // Forward Classes Declaration
@@ -3325,179 +2102,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  ConsumesDef_tie : public ConsumesDef
-{
-public:
-  ConsumesDef_tie (T &t);
-  // the T& ctor
-  ConsumesDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  ConsumesDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  ConsumesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~ConsumesDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::Boolean is_a (
-      const char * event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr event (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  ConsumesDef_tie (const ConsumesDef_tie &);
-  void operator= (const ConsumesDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class ComponentDef;
 typedef ComponentDef *ComponentDef_ptr;
 // Forward Classes Declaration
@@ -4313,571 +2917,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  ComponentDef_tie : public ComponentDef
-{
-public:
-  ComponentDef_tie (T &t);
-  // the T& ctor
-  ComponentDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  ComponentDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  ComponentDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~ComponentDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::ComponentDef_ptr base_component (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::ProvidesDefSeq * provides_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::UsesDefSeq * uses_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::EmitsDefSeq * emits_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::PublishesDefSeq * publishes_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::ConsumesDefSeq * consumes_events (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_basic (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::ProvidesDef_ptr create_provides (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::UsesDef_ptr create_uses (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_InterfaceDef_ptr interface_type,
-      CORBA::Boolean is_multiple,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::EmitsDef_ptr create_emits (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::PublishesDef_ptr create_publishes (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::ConsumesDef_ptr create_consumes (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AttributeDef_ptr create_attribute (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_OperationDef_ptr create_operation (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  ComponentDef_tie (const ComponentDef_tie &);
-  void operator= (const ComponentDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class PrimaryKeyDef;
 typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
 // Forward Classes Declaration
@@ -5171,179 +3210,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  PrimaryKeyDef_tie : public PrimaryKeyDef
-{
-public:
-  PrimaryKeyDef_tie (T &t);
-  // the T& ctor
-  PrimaryKeyDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  PrimaryKeyDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  PrimaryKeyDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~PrimaryKeyDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::Boolean is_a (
-      const char * primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr primary_key (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  PrimaryKeyDef_tie (const PrimaryKeyDef_tie &);
-  void operator= (const PrimaryKeyDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class FactoryDef;
 typedef FactoryDef *FactoryDef_ptr;
 // Forward Classes Declaration
@@ -5675,255 +3541,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  FactoryDef_tie : public FactoryDef
-{
-public:
-  FactoryDef_tie (T &t);
-  // the T& ctor
-  FactoryDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  FactoryDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  FactoryDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~FactoryDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void params (
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void contexts (
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void exceptions (
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  FactoryDef_tie (const FactoryDef_tie &);
-  void operator= (const FactoryDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class FinderDef;
 typedef FinderDef *FinderDef_ptr;
 // Forward Classes Declaration
@@ -6255,255 +3872,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  FinderDef_tie : public FinderDef
-{
-public:
-  FinderDef_tie (T &t);
-  // the T& ctor
-  FinderDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  FinderDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  FinderDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~FinderDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void params (
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void contexts (
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void exceptions (
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  FinderDef_tie (const FinderDef_tie &);
-  void operator= (const FinderDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class HomeDef;
 typedef HomeDef *HomeDef_ptr;
 // Forward Classes Declaration
@@ -7183,523 +4551,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  HomeDef_tie : public HomeDef
-{
-public:
-  HomeDef_tie (T &t);
-  // the T& ctor
-  HomeDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  HomeDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  HomeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~HomeDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  IR::HomeDef_ptr base_home (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::ComponentDef_ptr managed_component (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::PrimaryKeyDef_ptr primary_key (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::FactoryDefSeq * factories (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::FinderDefSeq * finders (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_basic (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::PrimaryKeyDef_ptr create_primary_key (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::FactoryDef_ptr create_factory (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  IR::FinderDef_ptr create_finder (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AttributeDef_ptr create_attribute (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_OperationDef_ptr create_operation (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  HomeDef_tie (const HomeDef_tie &);
-  void operator= (const HomeDef_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 }
 TAO_NAMESPACE_CLOSE
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
index df4f0cbe8c2..df3740a6107 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_T_H_
-#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_T_H_
+#ifndef _TAO_IDL_IFR_COMPONENTSS_T_H_
+#define _TAO_IDL_IFR_COMPONENTSS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -30,6 +30,3127 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
+TAO_NAMESPACE  POA_IR
+{
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  ComponentRepository_tie : public ComponentRepository
+  {
+  public:
+    ComponentRepository_tie (T &t);
+    // the T& ctor
+    ComponentRepository_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    ComponentRepository_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    ComponentRepository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~ComponentRepository_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    IR::ComponentDef_ptr create_component (
+        const char * id,
+        const char * name,
+        const char * version,
+        IR::ComponentDef_ptr base_component,
+        const CORBA_InterfaceDefSeq & supports_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::HomeDef_ptr create_home (
+        const char * id,
+        const char * name,
+        const char * version,
+        IR::HomeDef_ptr base_home,
+        IR::ComponentDef_ptr managed_component,
+        CORBA_ValueDef_ptr primary_key,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained_ptr lookup_id (
+        const char * search_id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::TypeCode_ptr get_canonical_typecode (
+        CORBA::TypeCode_ptr tc,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_PrimitiveDef_ptr get_primitive (
+        CORBA::PrimitiveKind kind,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_StringDef_ptr create_string (
+        CORBA::ULong bound,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_WstringDef_ptr create_wstring (
+        CORBA::ULong bound,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_SequenceDef_ptr create_sequence (
+        CORBA::ULong bound,
+        CORBA_IDLType_ptr element_type,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ArrayDef_ptr create_array (
+        CORBA::ULong length,
+        CORBA_IDLType_ptr element_type,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_FixedDef_ptr create_fixed (
+        CORBA::UShort digits,
+        CORBA::Short scale,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained_ptr lookup (
+        const char * search_name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ContainedSeq * contents (
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ContainedSeq * lookup_name (
+        const char * search_name,
+        CORBA::Long levels_to_search,
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container::DescriptionSeq * describe_contents (
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Long max_returned_objs,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ModuleDef_ptr create_module (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ConstantDef_ptr create_constant (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr type,
+        const CORBA::Any & value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_StructDef_ptr create_struct (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_UnionDef_ptr create_union (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr discriminator_type,
+        const CORBA_UnionMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_EnumDef_ptr create_enum (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_EnumMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_AliasDef_ptr create_alias (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr original_type,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_InterfaceDef_ptr create_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_InterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueDef_ptr create_value (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Boolean is_custom,
+        CORBA::Boolean is_abstract,
+        CORBA_ValueDef_ptr base_value,
+        CORBA::Boolean is_truncatable,
+        const CORBA_ValueDefSeq & abstract_base_values,
+        const CORBA_InterfaceDefSeq & supported_interfaces,
+        const CORBA_InitializerSeq & initializers,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueBoxDef_ptr create_value_box (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr original_type_def,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ExceptionDef_ptr create_exception (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_NativeDef_ptr create_native (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_LocalInterfaceDef_ptr create_local_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_InterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    ComponentRepository_tie (const ComponentRepository_tie &);
+    void operator= (const ComponentRepository_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  ProvidesDef_tie : public ProvidesDef
+  {
+  public:
+    ProvidesDef_tie (T &t);
+    // the T& ctor
+    ProvidesDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    ProvidesDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    ProvidesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~ProvidesDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA_InterfaceDef_ptr interface_type (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    ProvidesDef_tie (const ProvidesDef_tie &);
+    void operator= (const ProvidesDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  UsesDef_tie : public UsesDef
+  {
+  public:
+    UsesDef_tie (T &t);
+    // the T& ctor
+    UsesDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    UsesDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    UsesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~UsesDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA_InterfaceDef_ptr interface_type (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::Boolean is_multiple (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    UsesDef_tie (const UsesDef_tie &);
+    void operator= (const UsesDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  EventDef_tie : public EventDef
+  {
+  public:
+    EventDef_tie (T &t);
+    // the T& ctor
+    EventDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    EventDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    EventDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~EventDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA::Boolean is_a (
+        const char * event_id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueDef_ptr event (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    EventDef_tie (const EventDef_tie &);
+    void operator= (const EventDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  EmitsDef_tie : public EmitsDef
+  {
+  public:
+    EmitsDef_tie (T &t);
+    // the T& ctor
+    EmitsDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    EmitsDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    EmitsDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~EmitsDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA::Boolean is_a (
+        const char * event_id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueDef_ptr event (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    EmitsDef_tie (const EmitsDef_tie &);
+    void operator= (const EmitsDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  PublishesDef_tie : public PublishesDef
+  {
+  public:
+    PublishesDef_tie (T &t);
+    // the T& ctor
+    PublishesDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    PublishesDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    PublishesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~PublishesDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA::Boolean is_a (
+        const char * event_id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueDef_ptr event (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    PublishesDef_tie (const PublishesDef_tie &);
+    void operator= (const PublishesDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  ConsumesDef_tie : public ConsumesDef
+  {
+  public:
+    ConsumesDef_tie (T &t);
+    // the T& ctor
+    ConsumesDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    ConsumesDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    ConsumesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~ConsumesDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA::Boolean is_a (
+        const char * event_id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueDef_ptr event (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    ConsumesDef_tie (const ConsumesDef_tie &);
+    void operator= (const ConsumesDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  ComponentDef_tie : public ComponentDef
+  {
+  public:
+    ComponentDef_tie (T &t);
+    // the T& ctor
+    ComponentDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    ComponentDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    ComponentDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~ComponentDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA_InterfaceDefSeq * supported_interfaces (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void supported_interfaces (
+        const CORBA_InterfaceDefSeq & supported_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::ComponentDef_ptr base_component (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::ProvidesDefSeq * provides_interfaces (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::UsesDefSeq * uses_interfaces (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::EmitsDefSeq * emits_events (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::PublishesDefSeq * publishes_events (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::ConsumesDefSeq * consumes_events (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::Boolean is_basic (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::ProvidesDef_ptr create_provides (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_InterfaceDef_ptr interface_type,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::UsesDef_ptr create_uses (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_InterfaceDef_ptr interface_type,
+        CORBA::Boolean is_multiple,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::EmitsDef_ptr create_emits (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_ValueDef_ptr value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::PublishesDef_ptr create_publishes (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_ValueDef_ptr value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::ConsumesDef_ptr create_consumes (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_ValueDef_ptr value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_InterfaceDefSeq * base_interfaces (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void base_interfaces (
+        const CORBA_InterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::Boolean is_a (
+        const char * interface_id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_AttributeDef_ptr create_attribute (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr type,
+        CORBA::AttributeMode mode,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_OperationDef_ptr create_operation (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr result,
+        CORBA::OperationMode mode,
+        const CORBA_ParDescriptionSeq & params,
+        const CORBA_ExceptionDefSeq & exceptions,
+        const CORBA_ContextIdSeq & contexts,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained_ptr lookup (
+        const char * search_name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ContainedSeq * contents (
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ContainedSeq * lookup_name (
+        const char * search_name,
+        CORBA::Long levels_to_search,
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container::DescriptionSeq * describe_contents (
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Long max_returned_objs,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ModuleDef_ptr create_module (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ConstantDef_ptr create_constant (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr type,
+        const CORBA::Any & value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_StructDef_ptr create_struct (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_UnionDef_ptr create_union (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr discriminator_type,
+        const CORBA_UnionMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_EnumDef_ptr create_enum (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_EnumMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_AliasDef_ptr create_alias (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr original_type,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_InterfaceDef_ptr create_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_InterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueDef_ptr create_value (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Boolean is_custom,
+        CORBA::Boolean is_abstract,
+        CORBA_ValueDef_ptr base_value,
+        CORBA::Boolean is_truncatable,
+        const CORBA_ValueDefSeq & abstract_base_values,
+        const CORBA_InterfaceDefSeq & supported_interfaces,
+        const CORBA_InitializerSeq & initializers,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueBoxDef_ptr create_value_box (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr original_type_def,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ExceptionDef_ptr create_exception (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_NativeDef_ptr create_native (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_LocalInterfaceDef_ptr create_local_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_InterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::TypeCode_ptr type (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    ComponentDef_tie (const ComponentDef_tie &);
+    void operator= (const ComponentDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  PrimaryKeyDef_tie : public PrimaryKeyDef
+  {
+  public:
+    PrimaryKeyDef_tie (T &t);
+    // the T& ctor
+    PrimaryKeyDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    PrimaryKeyDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    PrimaryKeyDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~PrimaryKeyDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA::Boolean is_a (
+        const char * primary_key_id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueDef_ptr primary_key (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    PrimaryKeyDef_tie (const PrimaryKeyDef_tie &);
+    void operator= (const PrimaryKeyDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  FactoryDef_tie : public FactoryDef
+  {
+  public:
+    FactoryDef_tie (T &t);
+    // the T& ctor
+    FactoryDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    FactoryDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    FactoryDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~FactoryDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA::TypeCode_ptr result (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_IDLType_ptr result_def (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void result_def (
+        CORBA_IDLType_ptr result_def,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ParDescriptionSeq * params (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void params (
+        const CORBA_ParDescriptionSeq & params,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::OperationMode mode (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void mode (
+        CORBA::OperationMode mode,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ContextIdSeq * contexts (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void contexts (
+        const CORBA_ContextIdSeq & contexts,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ExceptionDefSeq * exceptions (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void exceptions (
+        const CORBA_ExceptionDefSeq & exceptions,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    FactoryDef_tie (const FactoryDef_tie &);
+    void operator= (const FactoryDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  FinderDef_tie : public FinderDef
+  {
+  public:
+    FinderDef_tie (T &t);
+    // the T& ctor
+    FinderDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    FinderDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    FinderDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~FinderDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA::TypeCode_ptr result (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_IDLType_ptr result_def (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void result_def (
+        CORBA_IDLType_ptr result_def,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ParDescriptionSeq * params (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void params (
+        const CORBA_ParDescriptionSeq & params,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::OperationMode mode (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void mode (
+        CORBA::OperationMode mode,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ContextIdSeq * contexts (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void contexts (
+        const CORBA_ContextIdSeq & contexts,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ExceptionDefSeq * exceptions (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void exceptions (
+        const CORBA_ExceptionDefSeq & exceptions,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    FinderDef_tie (const FinderDef_tie &);
+    void operator= (const FinderDef_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class  HomeDef_tie : public HomeDef
+  {
+  public:
+    HomeDef_tie (T &t);
+    // the T& ctor
+    HomeDef_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    HomeDef_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    HomeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~HomeDef_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    IR::HomeDef_ptr base_home (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::ComponentDef_ptr managed_component (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::PrimaryKeyDef_ptr primary_key (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::FactoryDefSeq * factories (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::FinderDefSeq * finders (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::Boolean is_basic (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::PrimaryKeyDef_ptr create_primary_key (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_ValueDef_ptr primary_key,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::FactoryDef_ptr create_factory (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_ParDescriptionSeq & params,
+        const CORBA_ExceptionDefSeq & exceptions,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    IR::FinderDef_ptr create_finder (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_ParDescriptionSeq & params,
+        const CORBA_ExceptionDefSeq & exceptions,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_InterfaceDefSeq * base_interfaces (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void base_interfaces (
+        const CORBA_InterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::Boolean is_a (
+        const char * interface_id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_AttributeDef_ptr create_attribute (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr type,
+        CORBA::AttributeMode mode,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_OperationDef_ptr create_operation (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr result,
+        CORBA::OperationMode mode,
+        const CORBA_ParDescriptionSeq & params,
+        const CORBA_ExceptionDefSeq & exceptions,
+        const CORBA_ContextIdSeq & contexts,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained_ptr lookup (
+        const char * search_name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ContainedSeq * contents (
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ContainedSeq * lookup_name (
+        const char * search_name,
+        CORBA::Long levels_to_search,
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container::DescriptionSeq * describe_contents (
+        CORBA::DefinitionKind limit_type,
+        CORBA::Boolean exclude_inherited,
+        CORBA::Long max_returned_objs,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ModuleDef_ptr create_module (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ConstantDef_ptr create_constant (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr type,
+        const CORBA::Any & value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_StructDef_ptr create_struct (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_UnionDef_ptr create_union (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr discriminator_type,
+        const CORBA_UnionMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_EnumDef_ptr create_enum (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_EnumMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_AliasDef_ptr create_alias (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr original_type,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_InterfaceDef_ptr create_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_InterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueDef_ptr create_value (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Boolean is_custom,
+        CORBA::Boolean is_abstract,
+        CORBA_ValueDef_ptr base_value,
+        CORBA::Boolean is_truncatable,
+        const CORBA_ValueDefSeq & abstract_base_values,
+        const CORBA_InterfaceDefSeq & supported_interfaces,
+        const CORBA_InitializerSeq & initializers,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ValueBoxDef_ptr create_value_box (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA_IDLType_ptr original_type_def,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_ExceptionDef_ptr create_exception (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_NativeDef_ptr create_native (
+        const char * id,
+        const char * name,
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_LocalInterfaceDef_ptr create_local_interface (
+        const char * id,
+        const char * name,
+        const char * version,
+        const CORBA_InterfaceDefSeq & base_interfaces,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void id (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void name (
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * version (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void version (
+        const char * version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Container_ptr defined_in (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    char * absolute_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Repository_ptr containing_repository (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA_Contained::Description * describe (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void move (
+        CORBA_Container_ptr new_container,
+        const char * new_name,
+        const char * new_version,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::TypeCode_ptr type (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    CORBA::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    HomeDef_tie (const HomeDef_tie &);
+    void operator= (const HomeDef_tie &);
+  };
+
+}
+TAO_NAMESPACE_CLOSE // module IR
+
+#endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ComponentsS_T.i"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
index df5ffd60ea3..fad9acbda38 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 #if defined (ACE_HAS_USING_KEYWORD)
+
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T &t)
 	: ptr_ (&t),
@@ -655,9 +655,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T &t)
 	: ptr_ (&t),
@@ -929,9 +926,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T &t)
 	: ptr_ (&t),
@@ -1216,9 +1210,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T &t)
 	: ptr_ (&t),
@@ -1505,9 +1496,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T &t)
 	: ptr_ (&t),
@@ -1794,9 +1782,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T &t)
 	: ptr_ (&t),
@@ -2083,9 +2068,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T &t)
 	: ptr_ (&t),
@@ -2372,9 +2354,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T &t)
 	: ptr_ (&t),
@@ -3337,9 +3316,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T &t)
 	: ptr_ (&t),
@@ -3626,9 +3602,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T &t)
 	: ptr_ (&t),
@@ -4040,9 +4013,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T &t)
 	: ptr_ (&t),
@@ -4454,9 +4424,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T &t)
 	: ptr_ (&t),
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
index 48656a330b3..f9905104c87 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
@@ -309,108 +309,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_FixedDef_tie : public POA_CORBA_FixedDef
-{
-public:
-  POA_CORBA_FixedDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_FixedDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_FixedDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_FixedDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::UShort digits (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void digits (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Short scale (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void scale (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_FixedDef_tie (const POA_CORBA_FixedDef_tie &);
-  void operator= (const POA_CORBA_FixedDef_tie &);
-};
-
-
 class POA_CORBA_ValueMemberDef;
 typedef POA_CORBA_ValueMemberDef *POA_CORBA_ValueMemberDef_ptr;
 // Forward Classes Declaration
@@ -777,202 +675,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_ValueMemberDef_tie : public POA_CORBA_ValueMemberDef
-{
-public:
-  POA_CORBA_ValueMemberDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ValueMemberDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ValueMemberDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Visibility access (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void access (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_ValueMemberDef_tie (const POA_CORBA_ValueMemberDef_tie &);
-  void operator= (const POA_CORBA_ValueMemberDef_tie &);
-};
-
-
 class POA_CORBA_ValueDef;
 typedef POA_CORBA_ValueDef *POA_CORBA_ValueDef_ptr;
 // Forward Classes Declaration
@@ -1869,550 +1571,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_ValueDef_tie : public POA_CORBA_ValueDef
-{
-public:
-  POA_CORBA_ValueDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ValueDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ValueDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ValueDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InitializerSeq * initializers (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void initializers (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr base_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void base_value (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDefSeq * abstract_base_values (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void abstract_base_values (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_abstract (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void is_abstract (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_custom (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void is_custom (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_truncatable (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void is_truncatable (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Boolean is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueMemberDef_ptr create_value_member (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AttributeDef_ptr create_attribute (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_OperationDef_ptr create_operation (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr result,
-      CORBA::OperationMode mode,
-      const CORBA_ParDescriptionSeq & params,
-      const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ContainedSeq * lookup_name (
-      const char * search_name,
-      CORBA::Long levels_to_search,
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container::DescriptionSeq * describe_contents (
-      CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ModuleDef_ptr create_module (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ConstantDef_ptr create_constant (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_StructDef_ptr create_struct (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_UnionDef_ptr create_union (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_EnumDef_ptr create_enum (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AliasDef_ptr create_alias (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_InterfaceDef_ptr create_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueDef_ptr create_value (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Boolean is_custom,
-      CORBA::Boolean is_abstract,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Boolean is_truncatable,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ValueBoxDef_ptr create_value_box (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_ExceptionDef_ptr create_exception (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_NativeDef_ptr create_native (
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_LocalInterfaceDef_ptr create_local_interface (
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_ValueDef_tie (const POA_CORBA_ValueDef_tie &);
-  void operator= (const POA_CORBA_ValueDef_tie &);
-};
-
-
 class POA_CORBA_ValueBoxDef;
 typedef POA_CORBA_ValueBoxDef *POA_CORBA_ValueBoxDef_ptr;
 // Forward Classes Declaration
@@ -2713,185 +1871,6 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class  POA_CORBA_ValueBoxDef_tie : public POA_CORBA_ValueBoxDef
-{
-public:
-  POA_CORBA_ValueBoxDef_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ValueBoxDef_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ValueBoxDef_tie (void);
-  // dtor
-  
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-  
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void move (
-      CORBA_Container_ptr new_container,
-      const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-  
-  // copy and assignment are not allowed
-  POA_CORBA_ValueBoxDef_tie (const POA_CORBA_ValueBoxDef_tie &);
-  void operator= (const POA_CORBA_ValueBoxDef_tie &);
-};
-
-
 #include "IFR_ExtendedS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
index 81959991ee5..7d17f89e246 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_T_H_
-#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_T_H_
+#ifndef _TAO_IDL_IFR_EXTENDEDS_T_H_
+#define _TAO_IDL_IFR_EXTENDEDS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -30,6 +30,1031 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
+TAO_NAMESPACE  POA_CORBA
+{
+}
+TAO_NAMESPACE_CLOSE // module CORBA
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_FixedDef_tie : public POA_CORBA_FixedDef
+{
+public:
+  POA_CORBA_FixedDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_FixedDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_FixedDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_FixedDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::UShort digits (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void digits (
+      CORBA::UShort digits,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Short scale (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void scale (
+      CORBA::Short scale,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_FixedDef_tie (const POA_CORBA_FixedDef_tie &);
+  void operator= (const POA_CORBA_FixedDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_ValueMemberDef_tie : public POA_CORBA_ValueMemberDef
+{
+public:
+  POA_CORBA_ValueMemberDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ValueMemberDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ValueMemberDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_IDLType_ptr type_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void type_def (
+      CORBA_IDLType_ptr type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Visibility access (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void access (
+      CORBA::Visibility access,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_ValueMemberDef_tie (const POA_CORBA_ValueMemberDef_tie &);
+  void operator= (const POA_CORBA_ValueMemberDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_ValueDef_tie : public POA_CORBA_ValueDef
+{
+public:
+  POA_CORBA_ValueDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ValueDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ValueDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ValueDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_InterfaceDefSeq * supported_interfaces (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void supported_interfaces (
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InitializerSeq * initializers (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void initializers (
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr base_value (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void base_value (
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDefSeq * abstract_base_values (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void abstract_base_values (
+      const CORBA_ValueDefSeq & abstract_base_values,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Boolean is_abstract (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void is_abstract (
+      CORBA::Boolean is_abstract,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Boolean is_custom (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void is_custom (
+      CORBA::Boolean is_custom,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Boolean is_truncatable (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void is_truncatable (
+      CORBA::Boolean is_truncatable,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Boolean is_a (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef::FullValueDescription * describe_value (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueMemberDef_ptr create_value_member (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      CORBA::Visibility access,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AttributeDef_ptr create_attribute (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      CORBA::AttributeMode mode,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_OperationDef_ptr create_operation (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr result,
+      CORBA::OperationMode mode,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained_ptr lookup (
+      const char * search_name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ContainedSeq * lookup_name (
+      const char * search_name,
+      CORBA::Long levels_to_search,
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container::DescriptionSeq * describe_contents (
+      CORBA::DefinitionKind limit_type,
+      CORBA::Boolean exclude_inherited,
+      CORBA::Long max_returned_objs,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ModuleDef_ptr create_module (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ConstantDef_ptr create_constant (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr type,
+      const CORBA::Any & value,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_StructDef_ptr create_struct (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_UnionDef_ptr create_union (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_EnumDef_ptr create_enum (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AliasDef_ptr create_alias (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_InterfaceDef_ptr create_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueDef_ptr create_value (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Boolean is_custom,
+      CORBA::Boolean is_abstract,
+      CORBA_ValueDef_ptr base_value,
+      CORBA::Boolean is_truncatable,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ValueBoxDef_ptr create_value_box (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_ExceptionDef_ptr create_exception (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_NativeDef_ptr create_native (
+      const char * id,
+      const char * name,
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
+      const char * id,
+      const char * name,
+      const char * version,
+      const CORBA_InterfaceDefSeq & base_interfaces,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_ValueDef_tie (const POA_CORBA_ValueDef_tie &);
+  void operator= (const POA_CORBA_ValueDef_tie &);
+};
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class  POA_CORBA_ValueBoxDef_tie : public POA_CORBA_ValueBoxDef
+{
+public:
+  POA_CORBA_ValueBoxDef_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ValueBoxDef_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ValueBoxDef_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA_IDLType_ptr original_type_def (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void original_type_def (
+      CORBA_IDLType_ptr original_type_def,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * id (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void id (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void name (
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * version (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void version (
+      const char * version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Container_ptr defined_in (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  char * absolute_name (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Repository_ptr containing_repository (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Contained::Description * describe (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void move (
+      CORBA_Container_ptr new_container,
+      const char * new_name,
+      const char * new_version,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::TypeCode_ptr type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_ValueBoxDef_tie (const POA_CORBA_ValueBoxDef_tie &);
+  void operator= (const POA_CORBA_ValueBoxDef_tie &);
+};
+
+#endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ExtendedS_T.i"
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
index c0c535a0f75..9a6cd61cc9e 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
@@ -19,6 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T &t)
 	: ptr_ (&t),
@@ -1744,3 +1746,4 @@ ACE_TRY_ENV
   );
 }
 
+#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
index 4e4e23693f7..532b5c0956c 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BaseS.h	Mon Apr 23 20:55:58 2001
-+++ IFR_BaseS.h	Mon Apr 23 20:21:34 2001
+--- orig/IFR_BaseS.h	Mon Apr 30 22:22:30 2001
++++ IFR_BaseS.h	Mon Apr 30 22:27:06 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,8 +8,14 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -23,7 +23,7 @@
- #define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_H_
+@@ -19,11 +19,11 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_IFR_BASES_H_
+-#define _TAO_IDL_IFR_BASES_H_
++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_H_
++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_H_
  
  #include "ace/pre.h"
 -#include "IFR_BaseC.h"
@@ -17,15 +23,179 @@
  
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
-@@ -45,11 +45,6 @@
- #if defined (__BORLANDC__)
+@@ -46,11 +46,6 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
--
+ 
 -TAO_NAMESPACE  POA_CORBA
 -{
 -}
--TAO_NAMESPACE_CLOSE
- 
+-TAO_NAMESPACE_CLOSE // module CORBA
+-
  class POA_CORBA_IRObject;
  typedef POA_CORBA_IRObject *POA_CORBA_IRObject_ptr;
+ // Forward Classes Declaration
+@@ -168,6 +163,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -175,6 +171,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -225,14 +223,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_Contained;
+ typedef POA_CORBA_Contained *POA_CORBA_Contained_ptr;
+ // Forward Classes Declaration
+@@ -516,6 +513,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -523,6 +521,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -653,14 +653,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_Container;
+ typedef POA_CORBA_Container *POA_CORBA_Container_ptr;
+ // Forward Classes Declaration
+@@ -1102,6 +1101,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -1109,6 +1109,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -1349,14 +1351,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_IDLType;
+ typedef POA_CORBA_IDLType *POA_CORBA_IDLType_ptr;
+ // Forward Classes Declaration
+@@ -1474,6 +1475,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -1481,6 +1483,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -1525,14 +1529,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_TypedefDef;
+ typedef POA_CORBA_TypedefDef *POA_CORBA_TypedefDef_ptr;
+ // Forward Classes Declaration
+@@ -1730,6 +1733,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -1737,6 +1741,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -1774,13 +1780,12 @@
+   
+   virtual ~_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void) { }
+   
+-  
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+-
+ 
+ #include "IFR_BaseS_T.h"
+ 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff
index 6703d617b17..e69de29bb2d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff
@@ -1,10 +0,0 @@
---- orig/IFR_BaseS_T.h	Mon Apr 23 20:55:58 2001
-+++ IFR_BaseS_T.h	Mon Apr 23 18:42:46 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.i.diff
index 969d4b9ec5d..e69de29bb2d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.i.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.i.diff
@@ -1,10 +0,0 @@
---- orig/IFR_BaseS_T.i	Mon Apr 23 20:55:58 2001
-+++ IFR_BaseS_T.i	Mon Apr 23 20:23:13 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
index 62849f10ba5..7ef393f6660 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BasicS.h	Mon Apr 23 20:56:03 2001
-+++ IFR_BasicS.h	Mon Apr 23 21:22:14 2001
+--- orig/IFR_BasicS.h	Mon Apr 30 22:22:33 2001
++++ IFR_BasicS.h	Mon Apr 30 22:31:49 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,7 +8,14 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -24,7 +24,7 @@
+@@ -19,12 +19,12 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_IFR_BASICS_H_
+-#define _TAO_IDL_IFR_BASICS_H_
++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_H_
++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_H_
  
  #include "ace/pre.h"
  #include "IFR_BaseS.h"
@@ -24,8 +31,634 @@
 -TAO_NAMESPACE  POA_CORBA
 -{
 -}
--TAO_NAMESPACE_CLOSE
+-TAO_NAMESPACE_CLOSE // module CORBA
 -
  class POA_CORBA_Repository;
  typedef POA_CORBA_Repository *POA_CORBA_Repository_ptr;
  // Forward Classes Declaration
+@@ -428,6 +423,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -435,6 +431,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -546,14 +544,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_ModuleDef;
+ typedef POA_CORBA_ModuleDef *POA_CORBA_ModuleDef_ptr;
+ // Forward Classes Declaration
+@@ -879,6 +876,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -886,6 +884,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -923,14 +923,13 @@
+   
+   virtual ~_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void) { }
+   
+-  
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_ConstantDef;
+ typedef POA_CORBA_ConstantDef *POA_CORBA_ConstantDef_ptr;
+ // Forward Classes Declaration
+@@ -1202,6 +1201,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -1209,6 +1209,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -1287,14 +1289,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_StructDef;
+ typedef POA_CORBA_StructDef *POA_CORBA_StructDef_ptr;
+ // Forward Classes Declaration
+@@ -1661,6 +1662,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -1668,6 +1670,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -1722,14 +1726,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_UnionDef;
+ typedef POA_CORBA_UnionDef *POA_CORBA_UnionDef_ptr;
+ // Forward Classes Declaration
+@@ -2145,6 +2148,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -2152,6 +2156,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -2231,14 +2237,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_EnumDef;
+ typedef POA_CORBA_EnumDef *POA_CORBA_EnumDef_ptr;
+ // Forward Classes Declaration
+@@ -2469,6 +2474,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -2476,6 +2482,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -2529,14 +2537,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_AliasDef;
+ typedef POA_CORBA_AliasDef *POA_CORBA_AliasDef_ptr;
+ // Forward Classes Declaration
+@@ -2767,6 +2774,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -2774,6 +2782,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -2827,14 +2837,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_NativeDef;
+ typedef POA_CORBA_NativeDef *POA_CORBA_NativeDef_ptr;
+ // Forward Classes Declaration
+@@ -3032,6 +3041,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -3039,6 +3049,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -3075,14 +3087,13 @@
+   
+   virtual ~_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void) { }
+   
+-  
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_PrimitiveDef;
+ typedef POA_CORBA_PrimitiveDef *POA_CORBA_PrimitiveDef_ptr;
+ // Forward Classes Declaration
+@@ -3208,6 +3219,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -3215,6 +3227,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -3259,14 +3273,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_StringDef;
+ typedef POA_CORBA_StringDef *POA_CORBA_StringDef_ptr;
+ // Forward Classes Declaration
+@@ -3409,6 +3422,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -3416,6 +3430,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -3469,14 +3485,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_WstringDef;
+ typedef POA_CORBA_WstringDef *POA_CORBA_WstringDef_ptr;
+ // Forward Classes Declaration
+@@ -3619,6 +3634,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -3626,6 +3642,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -3679,14 +3697,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_SequenceDef;
+ typedef POA_CORBA_SequenceDef *POA_CORBA_SequenceDef_ptr;
+ // Forward Classes Declaration
+@@ -3878,6 +3895,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -3885,6 +3903,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -3963,14 +3983,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_ArrayDef;
+ typedef POA_CORBA_ArrayDef *POA_CORBA_ArrayDef_ptr;
+ // Forward Classes Declaration
+@@ -4162,6 +4181,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -4169,6 +4189,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -4247,14 +4269,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_ExceptionDef;
+ typedef POA_CORBA_ExceptionDef *POA_CORBA_ExceptionDef_ptr;
+ // Forward Classes Declaration
+@@ -4629,6 +4650,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -4636,6 +4658,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -4698,14 +4722,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_AttributeDef;
+ typedef POA_CORBA_AttributeDef *POA_CORBA_AttributeDef_ptr;
+ // Forward Classes Declaration
+@@ -4977,6 +5000,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -4984,6 +5008,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -5062,14 +5088,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_OperationDef;
+ typedef POA_CORBA_OperationDef *POA_CORBA_OperationDef_ptr;
+ // Forward Classes Declaration
+@@ -5440,6 +5465,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -5447,6 +5473,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -5576,14 +5604,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_InterfaceDef;
+ typedef POA_CORBA_InterfaceDef *POA_CORBA_InterfaceDef_ptr;
+ // Forward Classes Declaration
+@@ -6028,6 +6055,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -6035,6 +6063,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -6136,14 +6166,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_AbstractInterfaceDef;
+ typedef POA_CORBA_AbstractInterfaceDef *POA_CORBA_AbstractInterfaceDef_ptr;
+ // Forward Classes Declaration
+@@ -6525,6 +6554,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -6532,6 +6562,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -6568,14 +6600,13 @@
+   
+   virtual ~_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) { }
+   
+-  
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_LocalInterfaceDef;
+ typedef POA_CORBA_LocalInterfaceDef *POA_CORBA_LocalInterfaceDef_ptr;
+ // Forward Classes Declaration
+@@ -6957,6 +6988,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -6964,6 +6996,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -7000,13 +7034,12 @@
+   
+   virtual ~_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) { }
+   
+-  
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+-
+ 
+ #include "IFR_BasicS_T.h"
+ 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff
index 1b2a750acb8..e69de29bb2d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff
@@ -1,10 +0,0 @@
---- orig/IFR_BasicS_T.h	Mon Apr 23 20:56:03 2001
-+++ IFR_BasicS_T.h	Mon Apr 23 19:00:13 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.i.diff
index 3cd3a23dd43..e69de29bb2d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.i.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.i.diff
@@ -1,10 +0,0 @@
---- orig/IFR_BasicS_T.i	Mon Apr 23 20:56:03 2001
-+++ IFR_BasicS_T.i	Mon Apr 23 21:20:33 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
index d45e1dd9732..0183dd4a15d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ComponentsS.h	Mon Apr 23 20:56:09 2001
-+++ IFR_ComponentsS.h	Mon Apr 23 20:33:16 2001
+--- orig/IFR_ComponentsS.h	Mon Apr 30 22:22:39 2001
++++ IFR_ComponentsS.h	Mon Apr 30 22:38:01 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,7 +8,14 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -24,7 +24,7 @@
+@@ -19,12 +19,12 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_IFR_COMPONENTSS_H_
+-#define _TAO_IDL_IFR_COMPONENTSS_H_
++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_H_
++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_H_
  
  #include "ace/pre.h"
  #include "IFR_ExtendedS.h"
@@ -17,3 +24,347 @@
  
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
+@@ -393,6 +393,7 @@
+     );
+   
+   private:
++  
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -400,6 +401,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++  private:
++    
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -463,9 +466,9 @@
+         CORBA::SystemException
+       ));
+ 
+-
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -676,6 +679,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -683,6 +687,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -727,9 +733,9 @@
+         CORBA::SystemException
+       ));
+ 
+-
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -956,6 +962,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -963,6 +970,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -1015,9 +1024,9 @@
+         CORBA::SystemException
+       ));
+ 
+-
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -1245,6 +1254,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -1252,6 +1262,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -1305,9 +1317,9 @@
+         CORBA::SystemException
+       ));
+ 
+-
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -1518,6 +1530,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -1525,6 +1538,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -1561,9 +1576,9 @@
+     
+     virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void) { }
+     
+-    
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -1774,6 +1789,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -1781,6 +1797,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -1817,9 +1835,9 @@
+     
+     virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void) { }
+     
+-    
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -2030,6 +2048,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -2037,6 +2056,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -2073,9 +2094,9 @@
+     
+     virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void) { }
+     
+-    
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -2708,6 +2729,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -2715,6 +2737,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -2885,9 +2909,9 @@
+         CORBA::SystemException
+       ));
+ 
+-
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -3115,6 +3139,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -3122,6 +3147,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -3175,9 +3202,9 @@
+         CORBA::SystemException
+       ));
+ 
+-
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -3460,6 +3487,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -3467,6 +3495,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -3503,9 +3533,9 @@
+     
+     virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void) { }
+     
+-    
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -3788,6 +3818,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -3795,6 +3826,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -3831,9 +3864,9 @@
+     
+     virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void) { }
+     
+-    
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -4378,6 +4411,7 @@
+     );
+   
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -4385,6 +4419,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++private:
++  
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -4507,16 +4543,16 @@
+         CORBA::SystemException
+       ));
+ 
+-
+   };
+   
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+   
+   
+ }
+-TAO_NAMESPACE_CLOSE // module IR
++TAO_NAMESPACE_CLOSE
+ 
+ #include "IFR_ComponentsS_T.h"
+ 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff
index 56539425ff1..e69de29bb2d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff
@@ -1,10 +0,0 @@
---- orig/IFR_ComponentsS_T.h	Mon Apr 23 20:56:09 2001
-+++ IFR_ComponentsS_T.h	Mon Apr 23 19:18:31 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.i.diff
index bef6c543871..e69de29bb2d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.i.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.i.diff
@@ -1,10 +0,0 @@
---- orig/IFR_ComponentsS_T.i	Mon Apr 23 20:56:09 2001
-+++ IFR_ComponentsS_T.i	Mon Apr 23 20:33:24 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
index a684093028f..c2d07095b4a 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ExtendedS.h	Mon Apr 23 20:56:05 2001
-+++ IFR_ExtendedS.h	Mon Apr 23 20:30:16 2001
+--- orig/IFR_ExtendedS.h	Mon Apr 30 22:22:36 2001
++++ IFR_ExtendedS.h	Mon Apr 30 22:34:49 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,7 +8,14 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -24,7 +24,7 @@
+@@ -19,12 +19,12 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_IFR_EXTENDEDS_H_
+-#define _TAO_IDL_IFR_EXTENDEDS_H_
++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_H_
++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_H_
  
  #include "ace/pre.h"
  #include "IFR_BasicS.h"
@@ -17,15 +24,146 @@
  
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
-@@ -46,11 +46,6 @@
- #if defined (__BORLANDC__)
+@@ -47,11 +47,6 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
--
+ 
 -TAO_NAMESPACE  POA_CORBA
 -{
 -}
--TAO_NAMESPACE_CLOSE
- 
+-TAO_NAMESPACE_CLOSE // module CORBA
+-
  class POA_CORBA_FixedDef;
  typedef POA_CORBA_FixedDef *POA_CORBA_FixedDef_ptr;
+ // Forward Classes Declaration
+@@ -227,6 +222,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -234,6 +230,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -304,14 +302,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_ValueMemberDef;
+ typedef POA_CORBA_ValueMemberDef *POA_CORBA_ValueMemberDef_ptr;
+ // Forward Classes Declaration
+@@ -583,6 +580,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -590,6 +588,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -668,14 +668,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_ValueDef;
+ typedef POA_CORBA_ValueDef *POA_CORBA_ValueDef_ptr;
+ // Forward Classes Declaration
+@@ -1339,6 +1338,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -1346,6 +1346,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -1562,14 +1564,13 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
+-
+ class POA_CORBA_ValueBoxDef;
+ typedef POA_CORBA_ValueBoxDef *POA_CORBA_ValueBoxDef_ptr;
+ // Forward Classes Declaration
+@@ -1800,6 +1801,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -1807,6 +1809,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++  
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -1860,13 +1864,12 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+-
+ 
+ #include "IFR_ExtendedS_T.h"
+ 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff
index b80c79588e2..e69de29bb2d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff
@@ -1,10 +0,0 @@
---- orig/IFR_ExtendedS_T.h	Mon Apr 23 20:56:05 2001
-+++ IFR_ExtendedS_T.h	Mon Apr 23 19:09:38 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.i.diff
index c82f18ee61d..e69de29bb2d 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.i.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.i.diff
@@ -1,10 +0,0 @@
---- orig/IFR_ExtendedS_T.i	Mon Apr 23 20:56:05 2001
-+++ IFR_ExtendedS_T.i	Mon Apr 23 20:30:31 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index f58a6e02347..b3221912dae 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -240,59 +240,6 @@ public:
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
-{
-public:
-  POA_CORBA_DomainManager_tie (T &t);
-  // the T& ctor
-  POA_CORBA_DomainManager_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_DomainManager_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_DomainManager_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  POA_CORBA_DomainManager_tie (const POA_CORBA_DomainManager_tie &);
-  void operator= (const POA_CORBA_DomainManager_tie &);
-};
-
-
 class POA_CORBA_ConstructionPolicy;
 typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr;
 // Forward Classes Declaration
@@ -517,84 +464,6 @@ public:
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_Domain_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
-{
-public:
-  POA_CORBA_ConstructionPolicy_tie (T &t);
-  // the T& ctor
-  POA_CORBA_ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_ConstructionPolicy_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_ConstructionPolicy_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::PolicyType policy_type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA::Policy_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  POA_CORBA_ConstructionPolicy_tie (const POA_CORBA_ConstructionPolicy_tie &);
-  void operator= (const POA_CORBA_ConstructionPolicy_tie &);
-};
-
-
 #include "DomainS_T.h"
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index baeca4df868..ce809a2dc64 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -30,6 +30,139 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
+{
+public:
+  POA_CORBA_DomainManager_tie (T &t);
+  // the T& ctor
+  POA_CORBA_DomainManager_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_DomainManager_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_DomainManager_tie (void);
+  // dtor
+
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+  CORBA::Policy_ptr get_domain_policy (
+      CORBA::PolicyType policy_type,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+
+  // copy and assignment are not allowed
+  POA_CORBA_DomainManager_tie (const POA_CORBA_DomainManager_tie &);
+  void operator= (const POA_CORBA_DomainManager_tie &);
+};
+
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class TAO_Domain_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
+{
+public:
+  POA_CORBA_ConstructionPolicy_tie (T &t);
+  // the T& ctor
+  POA_CORBA_ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_ConstructionPolicy_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_ConstructionPolicy_tie (void);
+  // dtor
+
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+  void make_domain_manager (
+      CORBA::InterfaceDef_ptr object_type,
+      CORBA::Boolean constr_policy,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::PolicyType policy_type (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA::Policy_ptr copy (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+
+  // copy and assignment are not allowed
+  POA_CORBA_ConstructionPolicy_tie (const POA_CORBA_ConstructionPolicy_tie &);
+  void operator= (const POA_CORBA_ConstructionPolicy_tie &);
+};
+
+#endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (__ACE_INLINE__)
 #include "DomainS_T.i"
diff --git a/TAO/tao/Domain/DomainS_T.i b/TAO/tao/Domain/DomainS_T.i
index 728401f3a43..f0f9bb83583 100644
--- a/TAO/tao/Domain/DomainS_T.i
+++ b/TAO/tao/Domain/DomainS_T.i
@@ -19,6 +19,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#if defined (ACE_HAS_USING_KEYWORD)
 
 template <class T> ACE_INLINE
 POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T &t)
@@ -244,3 +245,7 @@ void POA_CORBA_ConstructionPolicy_tie<T>::destroy  (
 ACE_TRY_ENV
   );
 }
+
+#endif /* ACE_HAS_USING_KEYWORD */
+
+
diff --git a/TAO/tao/Domain/TAO_Domain.dsp b/TAO/tao/Domain/TAO_Domain.dsp
index 28ef98bc249..392ae78a218 100644
--- a/TAO/tao/Domain/TAO_Domain.dsp
+++ b/TAO/tao/Domain/TAO_Domain.dsp
@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Debug\Domain"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DOMAIN_EXPORTS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_DOMAIN_BUILD_DLL" /YX /FD  /c

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DOMAIN_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_DOMAIN_BUILD_DLL" /YX /FD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -107,6 +107,10 @@ SOURCE=.\domain_export.h
 

 SOURCE=.\DomainS.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\DomainS_T.h

+# End Source File

 # End Group

 # Begin Group "Inline Files"

 

@@ -115,6 +119,10 @@ SOURCE=.\DomainS.h
 

 SOURCE=.\DomainS.i

 # End Source File

+# Begin Source File

+

+SOURCE=.\DomainS_T.i

+# End Source File

 # End Group

 # End Target

 # End Project

diff --git a/TAO/tao/Domain/TAO_Domain_Static.dsp b/TAO/tao/Domain/TAO_Domain_Static.dsp
index c84f10d32ed..9ca481b1a23 100644
--- a/TAO/tao/Domain/TAO_Domain_Static.dsp
+++ b/TAO/tao/Domain/TAO_Domain_Static.dsp
@@ -1,4 +1,4 @@
-# Microsoft Developer Studio Project File - Name="Domain_Static" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Domain_static" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

@@ -8,12 +8,12 @@ CFG=Domain_Static - Win32 Static Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

-!MESSAGE NMAKE /f "Domain_Static.mak".

+!MESSAGE NMAKE /f "TAO_Domain_Static.mak".

 !MESSAGE 

 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Domain_Static.mak" CFG="Domain_Static - Win32 Static Debug"

+!MESSAGE NMAKE /f "TAO_Domain_Static.mak" CFG="Domain_Static - Win32 Static Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -41,6 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "LIB\Release\Domain"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+MTL=midl.exe

+LINK32=link.exe -lib

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_CONSOLE" /D "NDEBUG" /D "_WINDOWS" /D "TAO_AS_STATIC_LIBS" /D "ACE_AS_STATIC_LIBS" /FD /c

 # SUBTRACT CPP /YX

@@ -49,11 +51,11 @@ RSC=rc.exe
 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LINK32=link.exe -lib

+LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo /out:"TAO_Domains.lib"

 

-!ELSEIF  "$(CFG)" == "Domain_Static - Win32 Static Debug"

+!ELSEIF  "$(CFG)" == "Domain_static - Win32 Static Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -65,7 +67,9 @@ LINK32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Debug\Domain"

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD  /c

+MTL=midl.exe

+LINK32=link.exe -lib

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_CONSOLE" /D "_DEBUG" /D "_WINDOWS" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -73,7 +77,7 @@ LINK32=link.exe -lib
 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LINK32=link.exe -lib

+LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo /out:"TAO_Domainsd.lib"

 

@@ -82,7 +86,7 @@ LINK32=link.exe -lib
 # Begin Target

 

 # Name "Domain_Static - Win32 Static Release"

-# Name "Domain_Static - Win32 Static Debug"

+# Name "Domain_static - Win32 Static Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

@@ -102,6 +106,10 @@ SOURCE=.\domain_export.h
 

 SOURCE=.\DomainS.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\DomainS_T.h

+# End Source File

 # End Group

 # Begin Group "Inline Files"

 

@@ -110,6 +118,10 @@ SOURCE=.\DomainS.h
 

 SOURCE=.\DomainS.i

 # End Source File

+# Begin Source File

+

+SOURCE=.\DomainS_T.i

+# End Source File

 # End Group

 # End Target

 # End Project

diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 86c5de08e92..d0fe41625d9 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -374,68 +374,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_PortableServer_Export ServerObject_tie : public ServerObject
-{
-public:
-  ServerObject_tie (T &t);
-  // the T& ctor
-  ServerObject_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  ServerObject_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~ServerObject_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  void ping (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void shutdown (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  ServerObject_tie (const ServerObject_tie &);
-  void operator= (const ServerObject_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class Administration;
 typedef Administration *Administration_ptr;
 // Forward Classes Declaration
@@ -1415,148 +1353,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_PortableServer_Export Administration_tie : public Administration
-{
-public:
-  Administration_tie (T &t);
-  // the T& ctor
-  Administration_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  Administration_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~Administration_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  void activate_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound,
-      ImplementationRepository::Administration::CannotActivate
-    ));
-
-  void register_server (
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::AlreadyRegistered
-    ));
-
-  void reregister_server (
-      const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void remove_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  void shutdown_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  char * server_is_running (
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  void server_is_shutting_down (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  void find (
-      const char * server,
-      ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      ImplementationRepository::Administration::NotFound
-    ));
-
-  void list (
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  Administration_tie (const Administration_tie &);
-  void operator= (const Administration_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 class ServerInformationIterator;
 typedef ServerInformationIterator *ServerInformationIterator_ptr;
 // Forward Classes Declaration
@@ -1891,70 +1687,6 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_PortableServer_Export ServerInformationIterator_tie : public ServerInformationIterator
-{
-public:
-  ServerInformationIterator_tie (T &t);
-  // the T& ctor
-  ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  ServerInformationIterator_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~ServerInformationIterator_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::Boolean next_n (
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  ServerInformationIterator_tie (const ServerInformationIterator_tie &);
-  void operator= (const ServerInformationIterator_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 }
 TAO_NAMESPACE_CLOSE
 
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h
index 16c66bd9d0a..da800daa397 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.h
+++ b/TAO/tao/PortableServer/ImplRepoS_T.h
@@ -30,6 +30,273 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
+TAO_NAMESPACE  POA_ImplementationRepository
+{
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class TAO_PortableServer_Export ServerObject_tie : public ServerObject
+  {
+  public:
+    ServerObject_tie (T &t);
+    // the T& ctor
+    ServerObject_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    ServerObject_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~ServerObject_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    void ping (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void shutdown (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    ServerObject_tie (const ServerObject_tie &);
+    void operator= (const ServerObject_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class TAO_PortableServer_Export Administration_tie : public Administration
+  {
+  public:
+    Administration_tie (T &t);
+    // the T& ctor
+    Administration_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    Administration_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~Administration_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    void activate_server (
+        const char * server,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ImplementationRepository::Administration::NotFound,
+        ImplementationRepository::Administration::CannotActivate
+      ));
+
+    void register_server (
+        const char * server,
+        const ImplementationRepository::StartupOptions & options,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ImplementationRepository::Administration::AlreadyRegistered
+      ));
+
+    void reregister_server (
+        const char * server,
+        const ImplementationRepository::StartupOptions & options,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void remove_server (
+        const char * server,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ImplementationRepository::Administration::NotFound
+      ));
+
+    void shutdown_server (
+        const char * server,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ImplementationRepository::Administration::NotFound
+      ));
+
+    char * server_is_running (
+        const char * server,
+        const char * addr,
+        ImplementationRepository::ServerObject_ptr server_object,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ImplementationRepository::Administration::NotFound
+      ));
+
+    void server_is_shutting_down (
+        const char * server,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ImplementationRepository::Administration::NotFound
+      ));
+
+    void find (
+        const char * server,
+        ImplementationRepository::ServerInformation_out info,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ImplementationRepository::Administration::NotFound
+      ));
+
+    void list (
+        CORBA::ULong how_many,
+        ImplementationRepository::ServerInformationList_out server_list,
+        ImplementationRepository::ServerInformationIterator_out server_iterator,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    Administration_tie (const Administration_tie &);
+    void operator= (const Administration_tie &);
+  };
+
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class TAO_PortableServer_Export ServerInformationIterator_tie : public ServerInformationIterator
+  {
+  public:
+    ServerInformationIterator_tie (T &t);
+    // the T& ctor
+    ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    ServerInformationIterator_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~ServerInformationIterator_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    CORBA::Boolean next_n (
+        CORBA::ULong how_many,
+        ImplementationRepository::ServerInformationList_out server_list,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+    void destroy (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    ServerInformationIterator_tie (const ServerInformationIterator_tie &);
+    void operator= (const ServerInformationIterator_tie &);
+  };
+
+}
+TAO_NAMESPACE_CLOSE // module ImplementationRepository
+
+#endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoS_T.i"
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i
index b3c4e54475a..8493026649f 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.i
+++ b/TAO/tao/PortableServer/ImplRepoS_T.i
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
 #if defined (ACE_HAS_USING_KEYWORD)
+
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t)
         : ptr_ (&t),
@@ -124,9 +124,6 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t)
         : ptr_ (&t),
@@ -361,9 +358,6 @@ how_many,
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t)
         : ptr_ (&t),
diff --git a/TAO/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h
index 955c56ae465..4d00d8c1256 100644
--- a/TAO/tao/PortableServer/MessagingS.h
+++ b/TAO/tao/PortableServer/MessagingS.h
@@ -216,59 +216,17 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_PortableServer_Export ReplyHandler_tie : public ReplyHandler
-{
-public:
-  ReplyHandler_tie (T &t);
-  // the T& ctor
-  ReplyHandler_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  ReplyHandler_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~ReplyHandler_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  ReplyHandler_tie (const ReplyHandler_tie &);
-  void operator= (const ReplyHandler_tie &);
-};
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
 #endif /* TAO_HAS_AMI_CALLBACK == 1 */
 
 }
 TAO_NAMESPACE_CLOSE
 
+#if (TAO_HAS_AMI_CALLBACK == 1)
+
 #include "MessagingS_T.h"
 
+#endif /* TAO_HAS_AMI_CALLBACK == 1 */
+
 #if defined (__ACE_INLINE__)
 #include "MessagingS.i"
 #endif /* defined INLINE */
diff --git a/TAO/tao/PortableServer/MessagingS_T.h b/TAO/tao/PortableServer/MessagingS_T.h
index 2d2730240a3..b9e6c8f3c1b 100644
--- a/TAO/tao/PortableServer/MessagingS_T.h
+++ b/TAO/tao/PortableServer/MessagingS_T.h
@@ -30,6 +30,57 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
+TAO_NAMESPACE  POA_Messaging
+{
+  // TIE class: Refer to CORBA v2.2, Section 20.34.4
+  template <class T>
+  class TAO_PortableServer_Export ReplyHandler_tie : public ReplyHandler
+  {
+  public:
+    ReplyHandler_tie (T &t);
+    // the T& ctor
+    ReplyHandler_tie (T &t, PortableServer::POA_ptr poa);
+    // ctor taking a POA
+    ReplyHandler_tie (T *tp, CORBA::Boolean release=1);
+    // ctor taking pointer and an ownership flag
+    ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+    // ctor with T*, ownership flag and a POA
+    ~ReplyHandler_tie (void);
+    // dtor
+    
+    // TIE specific functions
+    T *_tied_object (void);
+    // return the underlying object
+    void _tied_object (T &obj);
+    // set the underlying object
+    void _tied_object (T *obj, CORBA::Boolean release=1);
+    // set the underlying object and the ownership flag
+    CORBA::Boolean _is_owner (void);
+    // do we own it
+    void _is_owner (CORBA::Boolean b);
+    // set the ownership
+    
+    // overridden ServantBase operations
+    PortableServer::POA_ptr _default_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+  private:
+    T *ptr_;
+    PortableServer::POA_var poa_;
+    CORBA::Boolean rel_;
+    
+    // copy and assignment are not allowed
+    ReplyHandler_tie (const ReplyHandler_tie &);
+    void operator= (const ReplyHandler_tie &);
+  };
+
+}
+TAO_NAMESPACE_CLOSE // module Messaging
+
+#endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (__ACE_INLINE__)
 #include "MessagingS_T.i"
diff --git a/TAO/tao/PortableServer/MessagingS_T.i b/TAO/tao/PortableServer/MessagingS_T.i
index 88317ea43a3..a395d523643 100644
--- a/TAO/tao/PortableServer/MessagingS_T.i
+++ b/TAO/tao/PortableServer/MessagingS_T.i
@@ -19,9 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
-#if (TAO_HAS_AMI_CALLBACK == 1)
 #if defined (ACE_HAS_USING_KEYWORD)
+
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
 	: ptr_ (&t),
@@ -100,4 +99,3 @@ POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_EN
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
-#endif /* TAO_HAS_AMI_CALLBACK == 1 */
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index bbc37d512f0..3945d35240f 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -302,73 +302,6 @@ public:
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
-class TAO_PortableServer_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy
-{
-public:
-  POA_CORBA_Policy_tie (T &t);
-  // the T& ctor
-  POA_CORBA_Policy_tie (T &t, PortableServer::POA_ptr poa);
-  // ctor taking a POA
-  POA_CORBA_Policy_tie (T *tp, CORBA::Boolean release=1);
-  // ctor taking pointer and an ownership flag
-  POA_CORBA_Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-  // ctor with T*, ownership flag and a POA
-  ~POA_CORBA_Policy_tie (void);
-  // dtor
-
-  // TIE specific functions
-  T *_tied_object (void);
-  // return the underlying object
-  void _tied_object (T &obj);
-  // set the underlying object
-  void _tied_object (T *obj, CORBA::Boolean release=1);
-  // set the underlying object and the ownership flag
-  CORBA::Boolean _is_owner (void);
-  // do we own it
-  void _is_owner (CORBA::Boolean b);
-  // set the ownership
-
-  // overridden ServantBase operations
-  PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  CORBA::PolicyType policy_type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  CORBA_Policy_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-private:
-  T *ptr_;
-  PortableServer::POA_var poa_;
-  CORBA::Boolean rel_;
-
-  // copy and assignment are not allowed
-  POA_CORBA_Policy_tie (const POA_CORBA_Policy_tie &);
-  void operator= (const POA_CORBA_Policy_tie &);
-};
-
 
 #include "PolicyS_T.h"
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index f718b2d7c6f..3122b415c4b 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_POLICYS_T_H_
-#define _TAO_IDL_ORIG_POLICYS_T_H_
+#ifndef _TAO_IDL_POLICYS_T_H_
+#define _TAO_IDL_POLICYS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
@@ -30,6 +30,81 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
+TAO_NAMESPACE  POA_CORBA
+{
+}
+TAO_NAMESPACE_CLOSE // module CORBA
+
+// TIE class: Refer to CORBA v2.2, Section 20.34.4
+template <class T>
+class TAO_PortableServer_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy
+{
+public:
+  POA_CORBA_Policy_tie (T &t);
+  // the T& ctor
+  POA_CORBA_Policy_tie (T &t, PortableServer::POA_ptr poa);
+  // ctor taking a POA
+  POA_CORBA_Policy_tie (T *tp, CORBA::Boolean release=1);
+  // ctor taking pointer and an ownership flag
+  POA_CORBA_Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  // ctor with T*, ownership flag and a POA
+  ~POA_CORBA_Policy_tie (void);
+  // dtor
+  
+  // TIE specific functions
+  T *_tied_object (void);
+  // return the underlying object
+  void _tied_object (T &obj);
+  // set the underlying object
+  void _tied_object (T *obj, CORBA::Boolean release=1);
+  // set the underlying object and the ownership flag
+  CORBA::Boolean _is_owner (void);
+  // do we own it
+  void _is_owner (CORBA::Boolean b);
+  // set the ownership
+  
+  // overridden ServantBase operations
+  PortableServer::POA_ptr _default_POA (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  CORBA::PolicyType policy_type (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  CORBA_Policy_ptr copy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+private:
+  T *ptr_;
+  PortableServer::POA_var poa_;
+  CORBA::Boolean rel_;
+  
+  // copy and assignment are not allowed
+  POA_CORBA_Policy_tie (const POA_CORBA_Policy_tie &);
+  void operator= (const POA_CORBA_Policy_tie &);
+};
+
+#endif /* ACE_HAS_USING_KEYWORD */
 
 #if defined (__ACE_INLINE__)
 #include "PolicyS_T.i"
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
index 9fc70eaf0a4..c79cbc73651 100644
--- a/TAO/tao/PortableServer/PolicyS_T.i
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -19,6 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+#if defined (ACE_HAS_USING_KEYWORD)
+
 template <class T> ACE_INLINE
 POA_CORBA_Policy_tie<T>::POA_CORBA_Policy_tie (T &t)
 	: ptr_ (&t),
@@ -135,3 +137,4 @@ ACE_TRY_ENV
   );
 }
 
+#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/tao/diffs/DomainS.h.diff b/TAO/tao/diffs/DomainS.h.diff
index c00f24023e2..4ffb3b6192a 100644
--- a/TAO/tao/diffs/DomainS.h.diff
+++ b/TAO/tao/diffs/DomainS.h.diff
@@ -1,10 +1,24 @@
---- orig/DomainS.h	Tue Apr  3 17:47:30 2001
-+++ patched/DomainS.h	Tue Apr  3 20:44:14 2001
-@@ -23,9 +23,9 @@
- #define _TAO_IDL_ORIG_DOMAINS_H_
+--- orig/DomainS.h	Mon Apr 30 22:11:10 2001
++++ DomainS.h	Mon Apr 30 22:01:45 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,13 +19,13 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_DOMAINS_H_
+-#define _TAO_IDL_DOMAINS_H_
++#ifndef _TAO_IDL_ORIG_DOMAINS_H_
++#define _TAO_IDL_ORIG_DOMAINS_H_
  
  #include "ace/pre.h"
--#include "PolicyS.h"
+-#include "../../orig/PolicyS.h"
 -#include "DomainC.h"
 -
 +#include "domain_export.h"
@@ -13,318 +27,196 @@
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
-@@ -47,216 +47,6 @@
+@@ -47,15 +47,11 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
 -TAO_NAMESPACE  POA_CORBA
 -{
--  class InterfaceDef;
--  typedef InterfaceDef *InterfaceDef_ptr;
--  // Forward Classes Declaration
--  class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
--  class _TAO_InterfaceDef_Direct_Proxy_Impl;
--  class _TAO_InterfaceDef_Strategized_Proxy_Broker;
--  
--  class TAO_Export InterfaceDef :  public virtual PortableServer::ServantBase
--  {
--  protected:
--    InterfaceDef (void);
--
--  public:
--    InterfaceDef (const InterfaceDef& rhs);
--    virtual ~InterfaceDef (void);
--
--
--    virtual CORBA::Boolean _is_a (
--        const char* logical_type_id,
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--
--    virtual void* _downcast (
--        const char* logical_type_id
--      );
--
--    static void _is_a_skel (
--        TAO_ServerRequest &req,
--        void *obj,
--        void *context,
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--
--    static void _non_existent_skel (
--        TAO_ServerRequest &req,
--        void *obj,
--        void *context,
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--
--    static void _interface_skel (
--        TAO_ServerRequest &req,
--        void *obj,
--        void *context,
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--
--    virtual void _dispatch (
--        TAO_ServerRequest &_tao_req,
--        void *_tao_context,
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--
--    ::CORBA::InterfaceDef *_this (
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--
--    virtual const char* _interface_repository_id (void) const;
--
--
--  };
--
--  
--  ///////////////////////////////////////////////////////////////////////
--  //               Strategized Proxy Broker Declaration 
--  //
--  
--  class TAO_Export _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_InterfaceDef_Proxy_Broker
--  {
--  public: 
--    _TAO_InterfaceDef_Strategized_Proxy_Broker (void);
--    
--    virtual ~_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
--    
--    virtual ::CORBA::_TAO_InterfaceDef_Proxy_Impl &select_proxy (
--      ::CORBA::InterfaceDef *object,
--      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
--    );
--  
--  private:
--  
--  // Helper methods that takes care to create the proxy
--  // as soon as their use is necessary.
--    void create_proxy (
--      int collocation_strategy,
--      CORBA::Environment &ACE_TRY_ENV
--    );
--  
--  private:
--    
--    // Caches the proxy implementations. The proxy implementation
--    // are totally stateless, and those can be shared by all the
--    // instances of a given IDL interface type.
--    ::CORBA::_TAO_InterfaceDef_Proxy_Impl
--     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
--    
--    TAO_SYNCH_MUTEX mutex_;
--  // This funxtion is used to get an handle to the unique instance
--  // of the Strategized Proxy Broker that is available for a given
--  // interface.
--  
--  public:
--    static _TAO_InterfaceDef_Strategized_Proxy_Broker *the_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
--  };
--  
--  
--  //
--  //            End Strategized Proxy Broker Declaration 
--  ///////////////////////////////////////////////////////////////////////
--  
--  
--///////////////////////////////////////////////////////////////////////
--//                    ThruPOA  Impl. Declaration
--//
--
--class TAO_Export _TAO_InterfaceDef_ThruPOA_Proxy_Impl : 
--  public virtual ::CORBA::_TAO_InterfaceDef_Proxy_Impl,
--  public virtual TAO_ThruPOA_Object_Proxy_Impl
--{
--public:
--  _TAO_InterfaceDef_ThruPOA_Proxy_Impl (void);
--  
--  virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
--  
--  };
--
--
--//
--//                ThruPOA  Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--//                    Direct  Impl. Declaration
--//
--
--class TAO_Export _TAO_InterfaceDef_Direct_Proxy_Impl : 
--  public virtual CORBA::_TAO_InterfaceDef_Proxy_Impl,
--  public virtual TAO_Direct_Object_Proxy_Impl
--{
--public:
--  _TAO_InterfaceDef_Direct_Proxy_Impl (void);
--  
--  virtual ~_TAO_InterfaceDef_Direct_Proxy_Impl (void) { }
--  
--  };
--
--
--//
--//                Direct  Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class TAO_Export InterfaceDef_tie : public InterfaceDef
--{
--public:
--  InterfaceDef_tie (T &t);
--  // the T& ctor
--  InterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
--  // ctor taking a POA
--  InterfaceDef_tie (T *tp, CORBA::Boolean release=1);
--  // ctor taking pointer and an ownership flag
--  InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
--  // ctor with T*, ownership flag and a POA
--  ~InterfaceDef_tie (void);
--  // dtor
--  
--  // TIE specific functions
--  T *_tied_object (void);
--  // return the underlying object
--  void _tied_object (T &obj);
--  // set the underlying object
--  void _tied_object (T *obj, CORBA::Boolean release=1);
--  // set the underlying object and the ownership flag
--  CORBA::Boolean _is_owner (void);
--  // do we own it
--  void _is_owner (CORBA::Boolean b);
--  // set the ownership
--  
--  // overridden ServantBase operations
--  PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
--        TAO_default_environment ()
--    );
--private:
--  T *ptr_;
--  PortableServer::POA_var poa_;
--  CORBA::Boolean rel_;
--  
--  // copy and assignment are not allowed
--  InterfaceDef_tie (const InterfaceDef_tie &);
--  void operator= (const InterfaceDef_tie &);
--};
--
--#endif /* ACE_HAS_USING_KEYWORD */
--
 -}
--TAO_NAMESPACE_CLOSE
+-TAO_NAMESPACE_CLOSE // module CORBA
 -
  class POA_CORBA_DomainManager;
  typedef POA_CORBA_DomainManager *POA_CORBA_DomainManager_ptr;
  // Forward Classes Declaration
-@@ -264,7 +54,7 @@
- class _TAO_CORBA_DomainManager_Direct_Proxy_Impl;
+ class _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl;
++class _TAO_CORBA_DomainManager_Direct_Proxy_Impl;
  class _TAO_CORBA_DomainManager_Strategized_Proxy_Broker;
  
--class TAO_Export POA_CORBA_DomainManager :  public virtual PortableServer::ServantBase
-+class TAO_Domain_Export POA_CORBA_DomainManager :  public virtual PortableServer::ServantBase
- {
- protected:
-   POA_CORBA_DomainManager (void);
-@@ -347,7 +137,7 @@
- //               Strategized Proxy Broker Declaration 
- //
+ class TAO_Domain_Export POA_CORBA_DomainManager :  public virtual PortableServer::ServantBase
+@@ -116,7 +112,7 @@
  
--class TAO_Export _TAO_CORBA_DomainManager_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_DomainManager_Proxy_Broker
-+class TAO_Domain_Export _TAO_CORBA_DomainManager_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_DomainManager_Proxy_Broker
- {
- public: 
-   _TAO_CORBA_DomainManager_Strategized_Proxy_Broker (void);
-@@ -395,7 +185,7 @@
- //                    ThruPOA  Impl. Declaration
- //
+   virtual const char* _interface_repository_id (void) const;
  
--class TAO_Export _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl : 
-+class TAO_Domain_Export _TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl :
-   public virtual ::_TAO_CORBA_DomainManager_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl
- {
-@@ -425,7 +215,7 @@
- //                    Direct  Impl. Declaration
+-  virtual CORBA_Policy_ptr get_domain_policy (
++  virtual CORBA::Policy_ptr get_domain_policy (
+       CORBA::PolicyType policy_type,
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+@@ -154,6 +150,7 @@
+   );
+ 
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -161,6 +158,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -195,7 +194,7 @@
+   
+   virtual ~_TAO_CORBA_DomainManager_ThruPOA_Proxy_Impl (void) { }
+   
+-  virtual CORBA_Policy_ptr get_domain_policy (
++    virtual CORBA::Policy_ptr get_domain_policy (
+       CORBA_Object *_collocated_tao_target_,
+       CORBA::PolicyType policy_type,
+       CORBA::Environment &ACE_TRY_ENV
+@@ -204,18 +203,48 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
  //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
  
--class TAO_Export _TAO_CORBA_DomainManager_Direct_Proxy_Impl : 
-+class TAO_Domain_Export _TAO_CORBA_DomainManager_Direct_Proxy_Impl :
-   public virtual _TAO_CORBA_DomainManager_Proxy_Impl,
-   public virtual TAO_Direct_Object_Proxy_Impl
- {
-@@ -452,7 +242,7 @@
  
- // TIE class: Refer to CORBA v2.2, Section 20.34.4
- template <class T>
--class TAO_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
-+class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
- {
- public:
-   POA_CORBA_DomainManager_tie (T &t);
-@@ -510,7 +300,7 @@
- class _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl;
++///////////////////////////////////////////////////////////////////////
++//                    Direct  Impl. Declaration
++//
++
++class TAO_Domain_Export _TAO_CORBA_DomainManager_Direct_Proxy_Impl :
++  public virtual _TAO_CORBA_DomainManager_Proxy_Impl,
++  public virtual TAO_Direct_Object_Proxy_Impl
++{
++public:
++  _TAO_CORBA_DomainManager_Direct_Proxy_Impl (void);
++
++  virtual ~_TAO_CORBA_DomainManager_Direct_Proxy_Impl (void) { }
++
++    virtual CORBA::Policy_ptr get_domain_policy (
++      CORBA_Object *_collocated_tao_target_,
++      CORBA::PolicyType policy_type,
++      CORBA::Environment &ACE_TRY_ENV
++    )
++    ACE_THROW_SPEC ((
++      CORBA::SystemException
++    ));
++
++};
++
++
++//
++//                Direct  Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
++
+ class POA_CORBA_ConstructionPolicy;
+ typedef POA_CORBA_ConstructionPolicy *POA_CORBA_ConstructionPolicy_ptr;
+ // Forward Classes Declaration
+ class _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl;
++class _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl;
  class _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker;
  
--class TAO_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA::Policy
-+class TAO_Domain_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA_Policy
- {
- protected:
-   POA_CORBA_ConstructionPolicy (void);
-@@ -618,7 +408,7 @@
- //               Strategized Proxy Broker Declaration 
- //
+ class TAO_Domain_Export POA_CORBA_ConstructionPolicy : public virtual POA_CORBA_Policy
+@@ -277,7 +306,7 @@
+   virtual const char* _interface_repository_id (void) const;
  
--class TAO_Export _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ConstructionPolicy_Proxy_Broker
-+class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ConstructionPolicy_Proxy_Broker
- {
- public: 
-   _TAO_CORBA_ConstructionPolicy_Strategized_Proxy_Broker (void);
-@@ -666,10 +456,10 @@
- //                    ThruPOA  Impl. Declaration
- //
+   virtual void make_domain_manager (
+-      CORBA_InterfaceDef_ptr object_type,
++      CORBA::InterfaceDef_ptr object_type,
+       CORBA::Boolean constr_policy,
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+@@ -339,6 +368,7 @@
+   );
  
--class TAO_Export _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl : 
-+class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl :
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -346,6 +376,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -374,7 +406,7 @@
+ class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_ThruPOA_Proxy_Impl : 
    public virtual ::_TAO_CORBA_ConstructionPolicy_Proxy_Impl,
    public virtual TAO_ThruPOA_Object_Proxy_Impl,
--  public virtual ::POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl
+-  public virtual ::_TAO_CORBA_Policy_ThruPOA_Proxy_Impl
 +  public virtual _TAO_CORBA_Policy_ThruPOA_Proxy_Impl
    
  {
  public:
-@@ -699,10 +489,10 @@
- //                    Direct  Impl. Declaration
+@@ -384,7 +416,7 @@
+   
+   virtual void make_domain_manager (
+       CORBA_Object *_collocated_tao_target_,
+-      CORBA_InterfaceDef_ptr object_type,
++      CORBA::InterfaceDef_ptr object_type,
+       CORBA::Boolean constr_policy,
+       CORBA::Environment &ACE_TRY_ENV
+     )
+@@ -392,13 +424,45 @@
+       CORBA::SystemException
+     ));
+ 
+-
+ };
+ 
++
  //
+ //                ThruPOA  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
  
--class TAO_Export _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl : 
++
++///////////////////////////////////////////////////////////////////////
++//                    Direct  Impl. Declaration
++//
++
 +class TAO_Domain_Export _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl :
-   public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl,
-   public virtual TAO_Direct_Object_Proxy_Impl,
--  public virtual POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
++  public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl,
++  public virtual TAO_Direct_Object_Proxy_Impl,
 +  public virtual _TAO_CORBA_Policy_Direct_Proxy_Impl
-   
- {
- public:
-@@ -729,7 +519,7 @@
++
++{
++public:
++  _TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl (void);
++
++  virtual ~_TAO_CORBA_ConstructionPolicy_Direct_Proxy_Impl (void) { }
++
++    virtual void make_domain_manager (
++      CORBA_Object *_collocated_tao_target_,
++      CORBA::InterfaceDef_ptr object_type,
++      CORBA::Boolean constr_policy,
++      CORBA::Environment &ACE_TRY_ENV
++    )
++    ACE_THROW_SPEC ((
++      CORBA::SystemException
++    ));
++
++};
++
++
++//
++//                Direct  Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+ 
+ #include "DomainS_T.h"
  
- // TIE class: Refer to CORBA v2.2, Section 20.34.4
- template <class T>
--class TAO_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
-+class TAO_Domain_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
- {
- public:
-   POA_CORBA_ConstructionPolicy_tie (T &t);
diff --git a/TAO/tao/diffs/DomainS_T.h.diff b/TAO/tao/diffs/DomainS_T.h.diff
index e69de29bb2d..d85754fdf46 100644
--- a/TAO/tao/diffs/DomainS_T.h.diff
+++ b/TAO/tao/diffs/DomainS_T.h.diff
@@ -0,0 +1,68 @@
+--- orig/DomainS_T.h	Mon Apr 30 22:11:10 2001
++++ DomainS_T.h	Mon Apr 30 22:02:30 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,8 +19,8 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_DOMAINS_T_H_
+-#define _TAO_IDL_DOMAINS_T_H_
++#ifndef _TAO_IDL_ORIG_DOMAINS_T_H_
++#define _TAO_IDL_ORIG_DOMAINS_T_H_
+ 
+ #include "ace/pre.h"
+ #if defined(_MSC_VER)
+@@ -32,11 +32,6 @@
+ 
+ #if defined (ACE_HAS_USING_KEYWORD)
+ 
+-TAO_NAMESPACE  POA_CORBA
+-{
+-}
+-TAO_NAMESPACE_CLOSE // module CORBA
+-
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+ class TAO_Domain_Export POA_CORBA_DomainManager_tie : public POA_CORBA_DomainManager
+@@ -70,7 +65,7 @@
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+     );
+-  CORBA_Policy_ptr get_domain_policy (
++  CORBA::Policy_ptr get_domain_policy (
+       CORBA::PolicyType policy_type,
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+@@ -89,6 +84,7 @@
+   void operator= (const POA_CORBA_DomainManager_tie &);
+ };
+ 
++
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+ class TAO_Domain_Export POA_CORBA_ConstructionPolicy_tie : public POA_CORBA_ConstructionPolicy
+@@ -123,7 +119,7 @@
+         TAO_default_environment ()
+     );
+   void make_domain_manager (
+-      CORBA_InterfaceDef_ptr object_type,
++      CORBA::InterfaceDef_ptr object_type,
+       CORBA::Boolean constr_policy,
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+@@ -140,7 +136,7 @@
+       CORBA::SystemException
+     ));
+ 
+-  CORBA_Policy_ptr copy (
++  CORBA::Policy_ptr copy (
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+     )
diff --git a/TAO/tao/diffs/DomainS_T.i.diff b/TAO/tao/diffs/DomainS_T.i.diff
index 88670581678..f2ca3dfb51e 100644
--- a/TAO/tao/diffs/DomainS_T.i.diff
+++ b/TAO/tao/diffs/DomainS_T.i.diff
@@ -1,93 +1,43 @@
---- orig/DomainS_T.i	Tue Apr  3 17:47:30 2001
-+++ patched/DomainS_T.i	Tue Apr  3 17:57:52 2001
-@@ -20,85 +20,6 @@
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
+--- orig/DomainS_T.i	Mon Apr 30 22:11:10 2001
++++ DomainS_T.i	Mon Apr 30 22:03:06 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
  
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -99,7 +99,7 @@
+ }
+ 
+ template <class T> ACE_INLINE
+-CORBA_Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy  (
++CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy  (
+     CORBA::PolicyType policy_type,
+     CORBA::Environment &ACE_TRY_ENV
+   )
+@@ -192,7 +192,7 @@
  
--#if defined (ACE_HAS_USING_KEYWORD)
--template <class T> ACE_INLINE
--POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T &t)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (0)
--{}
--
--template <class T> ACE_INLINE
--POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (0)
--{}
--
--template <class T> ACE_INLINE
--POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T *tp, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (release)
--{}
--
--template <class T> ACE_INLINE
--POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (release)
--{}
--
--template <class T> ACE_INLINE
--POA_CORBA::InterfaceDef_tie<T>::~InterfaceDef_tie (void)
--{
--  if (this->rel_) delete this->ptr_;
--}
--
--template <class T> ACE_INLINE T *
--POA_CORBA::InterfaceDef_tie<T>::_tied_object (void)
--{
--  return this->ptr_;
--}
--
--template <class T> ACE_INLINE void
--POA_CORBA::InterfaceDef_tie<T>::_tied_object (T &obj)
--{
--  if (this->rel_) delete this->ptr_;
--  this->ptr_ = &obj;
--  this->rel_ = 0;
--}
--
--template <class T> ACE_INLINE void
--POA_CORBA::InterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
--{
--  if (this->rel_) delete this->ptr_;
--  this->ptr_ = obj;
--  this->rel_ = release;
--}
--
--template <class T> ACE_INLINE CORBA::Boolean
--POA_CORBA::InterfaceDef_tie<T>::_is_owner (void)
--{
--  return this->rel_;
--}
--
--template <class T> ACE_INLINE void
--POA_CORBA::InterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
--{
--  this->rel_ = b;
--}
--
--template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_CORBA::InterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
--{
--  if (!CORBA::is_nil (this->poa_.in ()))
--    return PortableServer::POA::_duplicate (this->poa_.in ());
--
--  return this->InterfaceDef::_default_POA (ACE_TRY_ENV);
--}
--
--#endif /* ACE_HAS_USING_KEYWORD */
  template <class T> ACE_INLINE
- POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_tie (T &t)
- 	: ptr_ (&t),
-@@ -323,4 +244,3 @@
- ACE_TRY_ENV
-   );
+ void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager  (
+-    CORBA_InterfaceDef_ptr object_type,
++    CORBA::InterfaceDef_ptr object_type,
+     CORBA::Boolean constr_policy,
+     CORBA::Environment &ACE_TRY_ENV
+   )
+@@ -221,7 +221,7 @@
  }
--
+ 
+ template <class T> ACE_INLINE
+-CORBA_Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy  (
++CORBA::Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy  (
+     CORBA::Environment &ACE_TRY_ENV
+   )
+   ACE_THROW_SPEC ((
+@@ -247,3 +247,5 @@
+ }
+ 
+ #endif /* ACE_HAS_USING_KEYWORD */
++
++
diff --git a/TAO/tao/diffs/ImplRepoS.h.diff b/TAO/tao/diffs/ImplRepoS.h.diff
index f8a283b3bea..c63563b9e76 100644
--- a/TAO/tao/diffs/ImplRepoS.h.diff
+++ b/TAO/tao/diffs/ImplRepoS.h.diff
@@ -1,1681 +1,799 @@
---- orig/ImplRepoS.h	Sun Apr  1 16:33:09 2001
-+++ ImplRepoS.h	Sun Apr  1 17:47:56 2001
-@@ -56,7 +56,7 @@
-   class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-   class _TAO_ServerObject_Direct_Proxy_Impl;
-   class _TAO_ServerObject_Strategized_Proxy_Broker;
--  
-+
-   class TAO_PortableServer_Export ServerObject :  public virtual PortableServer::ServantBase
-   {
-   protected:
-@@ -69,7 +69,7 @@
- 
-     virtual CORBA::Boolean _is_a (
-         const char* logical_type_id,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
- 
-@@ -81,7 +81,7 @@
-         TAO_ServerRequest &req,
-         void *obj,
-         void *context,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
- 
-@@ -89,7 +89,7 @@
-         TAO_ServerRequest &req,
-         void *obj,
-         void *context,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
- 
-@@ -97,26 +97,26 @@
-         TAO_ServerRequest &req,
-         void *obj,
-         void *context,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
- 
-     virtual void _dispatch (
-         TAO_ServerRequest &_tao_req,
-         void *_tao_context,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
- 
-     ::ImplementationRepository::ServerObject *_this (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
- 
-     virtual const char* _interface_repository_id (void) const;
- 
-     virtual void ping (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -124,15 +124,15 @@
-       )) = 0;
- 
-     static void ping_skel (
--        TAO_ServerRequest &_tao_req, 
--        void *_tao_obj, 
--        void *_tao_context, 
--        CORBA::Environment &ACE_TRY_ENV = 
-+        TAO_ServerRequest &_tao_req,
-+        void *_tao_obj,
-+        void *_tao_context,
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
+--- orig/ImplRepoS.h	Mon Apr 30 20:24:45 2001
++++ ImplRepoS.h	Mon Apr 30 20:27:24 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -35,6 +35,8 @@
+ #include "tao/PortableServer/Collocated_Object.h"
+ #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
+ #include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
++#include "tao/PortableServer/ServerRequestInfo.h"
++
+ #if defined(_MSC_VER)
+ #if (_MSC_VER >= 1200)
+ #pragma warning(push)
+@@ -146,6 +148,107 @@
        );
  
-     virtual void shutdown (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -140,14 +140,14 @@
-       )) = 0;
- 
-     static void shutdown_skel (
--        TAO_ServerRequest &_tao_req, 
--        void *_tao_obj, 
--        void *_tao_context, 
--        CORBA::Environment &ACE_TRY_ENV = 
-+        TAO_ServerRequest &_tao_req,
-+        void *_tao_obj,
-+        void *_tao_context,
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
  
--    
-+
- #if (TAO_HAS_INTERCEPTORS == 1)
-     // Generation of interceptors related RequestInfo classes per operation.
-     // This needed to be able to store the arguments, exceptions, contexts
-@@ -160,7 +160,7 @@
-       TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
-         TAO_ServerRequest &_tao_server_request,
-         POA_ImplementationRepository::ServerObject *tao_impl,
--        CORBA::Environment &ACE_TRY_ENV = 
++#if (TAO_HAS_INTERCEPTORS == 1)
++    // Generation of interceptors related RequestInfo classes per operation.
++    // This needed to be able to store the arguments, exceptions, contexts
++    // and build the lists dynamically on demand so that unnecessary time overhead
++    // of building these lists when they arent used is avoided.
++    class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ServerRequestInfo
++    {
++    public:
++      friend class POA_ImplementationRepository::ServerObject;
++      TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
++        TAO_ServerRequest &_tao_server_request,
++        POA_ImplementationRepository::ServerObject *tao_impl,
 +        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
- 
-@@ -169,37 +169,37 @@
-             TAO_default_environment ()
-         )
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-       virtual Dynamic::ExceptionList * exceptions (
-           CORBA::Environment &ACE_TRY_ENV =
-             TAO_default_environment ()
-         )
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-       virtual CORBA::Any * result (
-           CORBA::Environment &ACE_TRY_ENV =
-             TAO_default_environment ()
-         )
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-       virtual char * target_most_derived_interface (
-           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-       virtual CORBA::Boolean target_is_a (
-           const char * id,
-           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-     private:
-       TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
-       void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
--      
-+
-     private:
-       POA_ImplementationRepository::ServerObject *_tao_impl;
--      
-+
-     };
--    
-+
-     class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo
-     {
-     public:
-@@ -207,7 +207,7 @@
-       TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
-         TAO_ServerRequest &_tao_server_request,
-         POA_ImplementationRepository::ServerObject *tao_impl,
--        CORBA::Environment &ACE_TRY_ENV = 
++          TAO_default_environment ()
++      );
++
++      virtual Dynamic::ParameterList * arguments (
++          CORBA::Environment &ACE_TRY_ENV =
++            TAO_default_environment ()
++        )
++        ACE_THROW_SPEC ((CORBA::SystemException));
++
++      virtual Dynamic::ExceptionList * exceptions (
++          CORBA::Environment &ACE_TRY_ENV =
++            TAO_default_environment ()
++        )
++        ACE_THROW_SPEC ((CORBA::SystemException));
++
++      virtual CORBA::Any * result (
++          CORBA::Environment &ACE_TRY_ENV =
++            TAO_default_environment ()
++        )
++        ACE_THROW_SPEC ((CORBA::SystemException));
++
++      virtual char * target_most_derived_interface (
++          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++        ACE_THROW_SPEC ((CORBA::SystemException));
++
++      virtual CORBA::Boolean target_is_a (
++          const char * id,
++          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++        ACE_THROW_SPEC ((CORBA::SystemException));
++
++    private:
++      TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
++      void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &);
++
++    private:
++      POA_ImplementationRepository::ServerObject *_tao_impl;
++
++    };
++
++    class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo
++    {
++    public:
++      friend class POA_ImplementationRepository::ServerObject;
++      TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
++        TAO_ServerRequest &_tao_server_request,
++        POA_ImplementationRepository::ServerObject *tao_impl,
 +        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
- 
-@@ -216,103 +216,103 @@
-             TAO_default_environment ()
-         )
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-       virtual Dynamic::ExceptionList * exceptions (
-           CORBA::Environment &ACE_TRY_ENV =
-             TAO_default_environment ()
-         )
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-       virtual CORBA::Any * result (
-           CORBA::Environment &ACE_TRY_ENV =
-             TAO_default_environment ()
-         )
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-       virtual char * target_most_derived_interface (
-           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-       virtual CORBA::Boolean target_is_a (
-           const char * id,
-           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-         ACE_THROW_SPEC ((CORBA::SystemException));
--      
-+
-     private:
-       TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-       void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
--      
-+
-     private:
-       POA_ImplementationRepository::ServerObject *_tao_impl;
--      
-+
-     };
--    
-+
-     #endif /* TAO_HAS_INTERCEPTORS */
- 
-   };
- 
--  
++          TAO_default_environment ()
++      );
 +
-   ///////////////////////////////////////////////////////////////////////
--  //               Strategized Proxy Broker Declaration 
-+  //               Strategized Proxy Broker Declaration
-   //
--  
++      virtual Dynamic::ParameterList * arguments (
++          CORBA::Environment &ACE_TRY_ENV =
++            TAO_default_environment ()
++        )
++        ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker
-   {
--  public: 
-+  public:
-     _TAO_ServerObject_Strategized_Proxy_Broker (void);
--    
++      virtual Dynamic::ExceptionList * exceptions (
++          CORBA::Environment &ACE_TRY_ENV =
++            TAO_default_environment ()
++        )
++        ACE_THROW_SPEC ((CORBA::SystemException));
 +
-     virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void);
--    
++      virtual CORBA::Any * result (
++          CORBA::Environment &ACE_TRY_ENV =
++            TAO_default_environment ()
++        )
++        ACE_THROW_SPEC ((CORBA::SystemException));
 +
-     virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy (
-       ::ImplementationRepository::ServerObject *object,
-       CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-     );
--  
++      virtual char * target_most_derived_interface (
++          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++        ACE_THROW_SPEC ((CORBA::SystemException));
++
++      virtual CORBA::Boolean target_is_a (
++          const char * id,
++          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++        ACE_THROW_SPEC ((CORBA::SystemException));
++
++    private:
++      TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
++      void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &);
 +
++    private:
++      POA_ImplementationRepository::ServerObject *_tao_impl;
++
++    };
++
++    #endif /* TAO_HAS_INTERCEPTORS */
++
+   };
+ 
+   
+@@ -166,6 +269,7 @@
+     );
+   
    private:
--  
 +
-   // Helper methods that takes care to create the proxy
-   // as soon as their use is necessary.
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
      void create_proxy (
-       int collocation_strategy,
+@@ -173,6 +277,8 @@
        CORBA::Environment &ACE_TRY_ENV
      );
--  
-+
-   private:
--    
+     
++  private:
 +
      // Caches the proxy implementations. The proxy implementation
      // are totally stateless, and those can be shared by all the
      // instances of a given IDL interface type.
-     ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl
-      *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
--    
-+
-     TAO_SYNCH_MUTEX mutex_;
-   // This funxtion is used to get an handle to the unique instance
-   // of the Strategized Proxy Broker that is available for a given
-   // interface.
--  
-+
-   public:
-     static _TAO_ServerObject_Strategized_Proxy_Broker *the_TAO_ServerObject_Strategized_Proxy_Broker (void);
+@@ -223,9 +329,9 @@
+         CORBA::SystemException
+       ));
+ 
+-
    };
--  
--  
-+
+   
 +
    //
--  //            End Strategized Proxy Broker Declaration 
-+  //            End Strategized Proxy Broker Declaration
+   //                ThruPOA  Proxy Impl. Declaration
    ///////////////////////////////////////////////////////////////////////
--  
--  
-+
-+
- ///////////////////////////////////////////////////////////////////////
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl :
-   public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl
- {
- public:
-   _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) { }
--  
-+
-     virtual void ping (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -341,15 +341,15 @@
- //                    Direct  Impl. Declaration
- //
- 
--class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl :
-   public virtual ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
-   public virtual TAO_Direct_Object_Proxy_Impl
- {
- public:
-   _TAO_ServerObject_Direct_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) { }
--  
-+
-     virtual void ping (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -390,7 +390,7 @@
-   // ctor with T*, ownership flag and a POA
-   ~ServerObject_tie (void);
-   // dtor
--  
-+
-   // TIE specific functions
-   T *_tied_object (void);
-   // return the underlying object
-@@ -402,14 +402,14 @@
-   // do we own it
-   void _is_owner (CORBA::Boolean b);
-   // set the ownership
--  
-+
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   void ping (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -417,7 +417,7 @@
-     ));
- 
-   void shutdown (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -428,7 +428,7 @@
-   T *ptr_;
-   PortableServer::POA_var poa_;
-   CORBA::Boolean rel_;
--  
-+
-   // copy and assignment are not allowed
-   ServerObject_tie (const ServerObject_tie &);
-   void operator= (const ServerObject_tie &);
-@@ -455,7 +455,7 @@
- 
-   virtual CORBA::Boolean _is_a (
-       const char* logical_type_id,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -467,7 +467,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -475,7 +475,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -483,19 +483,19 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
+@@ -502,6 +608,466 @@
      );
  
-   virtual void _dispatch (
-       TAO_ServerRequest &_tao_req,
-       void *_tao_context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   ::ImplementationRepository::Administration *_this (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -503,7 +503,7 @@
- 
-   virtual void activate_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -513,17 +513,17 @@
-     )) = 0;
- 
-   static void activate_server_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   virtual void register_server (
-       const char * server,
-       const ImplementationRepository::StartupOptions & options,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -532,17 +532,17 @@
-     )) = 0;
  
-   static void register_server_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   virtual void reregister_server (
-       const char * server,
-       const ImplementationRepository::StartupOptions & options,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -550,16 +550,16 @@
-     )) = 0;
- 
-   static void reregister_server_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   virtual void remove_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -568,16 +568,16 @@
-     )) = 0;
- 
-   static void remove_server_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   virtual void shutdown_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -586,10 +586,10 @@
-     )) = 0;
- 
-   static void shutdown_server_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -597,7 +597,7 @@
-       const char * server,
-       const char * addr,
-       ImplementationRepository::ServerObject_ptr server_object,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -606,16 +606,16 @@
-     )) = 0;
- 
-   static void server_is_running_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   virtual void server_is_shutting_down (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -624,17 +624,17 @@
-     )) = 0;
- 
-   static void server_is_shutting_down_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   virtual void find (
-       const char * server,
-       ImplementationRepository::ServerInformation_out info,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -643,10 +643,10 @@
-     )) = 0;
- 
-   static void find_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -654,7 +654,7 @@
-       CORBA::ULong how_many,
-       ImplementationRepository::ServerInformationList_out server_list,
-       ImplementationRepository::ServerInformationIterator_out server_iterator,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -662,14 +662,14 @@
-     )) = 0;
- 
-   static void list_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
--  
-+
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-   // This needed to be able to store the arguments, exceptions, contexts
-@@ -683,7 +683,7 @@
-       TAO_ServerRequest &_tao_server_request,
-       POA_ImplementationRepository::Administration *tao_impl,
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
++#if (TAO_HAS_INTERCEPTORS == 1)
++  // Generation of interceptors related RequestInfo classes per operation.
++  // This needed to be able to store the arguments, exceptions, contexts
++  // and build the lists dynamically on demand so that unnecessary time overhead
++  // of building these lists when they arent used is avoided.
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
++      const char * server,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -692,38 +692,38 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const char * server_;
--    
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -733,7 +733,7 @@
-       POA_ImplementationRepository::Administration *tao_impl,
-       const char * server,
-       const ImplementationRepository::StartupOptions & options,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -742,39 +742,39 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
--    
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const char * server_;
-     const ImplementationRepository::StartupOptions & options_;
--    
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -784,7 +784,7 @@
-       POA_ImplementationRepository::Administration *tao_impl,
-       const char * server,
-       const ImplementationRepository::StartupOptions & options,
--      CORBA::Environment &ACE_TRY_ENV = 
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const char * server_;
++
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
++      const char * server,
++      const ImplementationRepository::StartupOptions & options,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -793,39 +793,39 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const char * server_;
-     const ImplementationRepository::StartupOptions & options_;
--    
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -834,7 +834,7 @@
-       TAO_ServerRequest &_tao_server_request,
-       POA_ImplementationRepository::Administration *tao_impl,
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const char * server_;
++    const ImplementationRepository::StartupOptions & options_;
++
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
++      const char * server,
++      const ImplementationRepository::StartupOptions & options,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -843,38 +843,38 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const char * server_;
--    
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -883,7 +883,7 @@
-       TAO_ServerRequest &_tao_server_request,
-       POA_ImplementationRepository::Administration *tao_impl,
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const char * server_;
++    const ImplementationRepository::StartupOptions & options_;
++
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
++      const char * server,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -892,38 +892,38 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const char * server_;
--    
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -934,7 +934,7 @@
-       const char * server,
-       const char * addr,
-       ImplementationRepository::ServerObject_ptr server_object,
--      CORBA::Environment &ACE_TRY_ENV = 
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const char * server_;
++
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
++      const char * server,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -943,42 +943,42 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const char * server_;
-     const char * addr_;
-     ImplementationRepository::ServerObject_ptr server_object_;
-     void result (char * result);
--    // update the result 
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const char * server_;
++
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
++      const char * server,
++      const char * addr,
++      ImplementationRepository::ServerObject_ptr server_object,
++      CORBA::Environment &ACE_TRY_ENV =
++        TAO_default_environment ()
++    );
++
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const char * server_;
++    const char * addr_;
++    ImplementationRepository::ServerObject_ptr server_object_;
++    void result (char * result);
 +    // update the result
-     char * _result;
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -987,7 +987,7 @@
-       TAO_ServerRequest &_tao_server_request,
-       POA_ImplementationRepository::Administration *tao_impl,
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
++    char * _result;
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
++      const char * server,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -996,38 +996,38 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const char * server_;
--    
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -1036,7 +1036,7 @@
-       TAO_ServerRequest &_tao_server_request,
-       POA_ImplementationRepository::Administration *tao_impl,
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const char * server_;
++
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
++      const char * server,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -1045,38 +1045,38 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const char * server_;
--    
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -1084,9 +1084,9 @@
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
-       TAO_ServerRequest &_tao_server_request,
-       POA_ImplementationRepository::Administration *tao_impl,
--      const CORBA::ULong & how_many      
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_find (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const char * server_;
++
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::Administration;
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::Administration *tao_impl,
 +      const CORBA::ULong & how_many
- ,
--      CORBA::Environment &ACE_TRY_ENV = 
++,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -1095,55 +1095,55 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::Administration *_tao_impl;
-     const CORBA::ULong & how_many_;
--        
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
- 
-   };
--  
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_Administration_list (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &);
++
++  private:
++    POA_ImplementationRepository::Administration *_tao_impl;
++    const CORBA::ULong & how_many_;
++
++
++  };
++
++  #endif /* TAO_HAS_INTERCEPTORS */
 +
-   #endif /* TAO_HAS_INTERCEPTORS */
- 
  };
  
  
- ///////////////////////////////////////////////////////////////////////
--//               Strategized Proxy Broker Declaration 
-+//               Strategized Proxy Broker Declaration
- //
- 
- class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker
- {
--public: 
-+public:
-   _TAO_Administration_Strategized_Proxy_Broker (void);
--  
-+
-   virtual ~_TAO_Administration_Strategized_Proxy_Broker (void);
--  
-+
-   virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy (
-     ::ImplementationRepository::Administration *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-@@ -1159,13 +1159,13 @@
+@@ -522,6 +1088,7 @@
    );
  
  private:
--  
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -529,6 +1096,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
 +
    // Caches the proxy implementations. The proxy implementation
    // are totally stateless, and those can be shared by all the
    // instances of a given IDL interface type.
-   ::ImplementationRepository::_TAO_Administration_Proxy_Impl
-    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
--  
-+
-   TAO_SYNCH_MUTEX mutex_;
- // This funxtion is used to get an handle to the unique instance
- // of the Strategized Proxy Broker that is available for a given
-@@ -1177,7 +1177,7 @@
+@@ -659,9 +1228,9 @@
+       CORBA::SystemException
+     ));
  
+-
+ };
  
++
  //
--//            End Strategized Proxy Broker Declaration 
-+//            End Strategized Proxy Broker Declaration
+ //                ThruPOA  Proxy Impl. Declaration
  ///////////////////////////////////////////////////////////////////////
- 
- 
-@@ -1185,15 +1185,15 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl :
-   public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl
- {
- public:
-   _TAO_Administration_ThruPOA_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) { }
--  
-+
-     virtual void activate_server (
-       CORBA_Object *_collocated_tao_target_,
-       const char * server,
-@@ -1302,15 +1302,15 @@
- //                    Direct  Impl. Declaration
- //
- 
--class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl :
-   public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl,
-   public virtual TAO_Direct_Object_Proxy_Impl
- {
- public:
-   _TAO_Administration_Direct_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_Administration_Direct_Proxy_Impl (void) { }
--  
-+
-     virtual void activate_server (
-       CORBA_Object *_collocated_tao_target_,
-       const char * server,
-@@ -1431,7 +1431,7 @@
-   // ctor with T*, ownership flag and a POA
-   ~Administration_tie (void);
-   // dtor
--  
-+
-   // TIE specific functions
-   T *_tied_object (void);
-   // return the underlying object
-@@ -1443,15 +1443,15 @@
-   // do we own it
-   void _is_owner (CORBA::Boolean b);
-   // set the ownership
--  
-+
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   void activate_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1463,7 +1463,7 @@
-   void register_server (
-       const char * server,
-       const ImplementationRepository::StartupOptions & options,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1474,7 +1474,7 @@
-   void reregister_server (
-       const char * server,
-       const ImplementationRepository::StartupOptions & options,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1483,7 +1483,7 @@
- 
-   void remove_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1493,7 +1493,7 @@
- 
-   void shutdown_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1505,7 +1505,7 @@
-       const char * server,
-       const char * addr,
-       ImplementationRepository::ServerObject_ptr server_object,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1515,7 +1515,7 @@
- 
-   void server_is_shutting_down (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1526,7 +1526,7 @@
-   void find (
-       const char * server,
-       ImplementationRepository::ServerInformation_out info,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1538,7 +1538,7 @@
-       CORBA::ULong how_many,
-       ImplementationRepository::ServerInformationList_out server_list,
-       ImplementationRepository::ServerInformationIterator_out server_iterator,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1549,7 +1549,7 @@
-   T *ptr_;
-   PortableServer::POA_var poa_;
-   CORBA::Boolean rel_;
--  
-+
-   // copy and assignment are not allowed
-   Administration_tie (const Administration_tie &);
-   void operator= (const Administration_tie &);
-@@ -1576,7 +1576,7 @@
- 
-   virtual CORBA::Boolean _is_a (
-       const char* logical_type_id,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -1588,7 +1588,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -1596,7 +1596,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -1604,19 +1604,19 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   virtual void _dispatch (
-       TAO_ServerRequest &_tao_req,
-       void *_tao_context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
+@@ -884,6 +1453,111 @@
      );
  
-   ::ImplementationRepository::ServerInformationIterator *_this (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -1625,7 +1625,7 @@
-   virtual CORBA::Boolean next_n (
-       CORBA::ULong how_many,
-       ImplementationRepository::ServerInformationList_out server_list,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1633,15 +1633,15 @@
-     )) = 0;
- 
-   static void next_n_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-   virtual void destroy (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1649,14 +1649,14 @@
-     )) = 0;
- 
-   static void destroy_skel (
--      TAO_ServerRequest &_tao_req, 
--      void *_tao_obj, 
--      void *_tao_context, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      TAO_ServerRequest &_tao_req,
-+      void *_tao_obj,
-+      void *_tao_context,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
  
--  
-+
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-   // This needed to be able to store the arguments, exceptions, contexts
-@@ -1670,7 +1670,7 @@
-       TAO_ServerRequest &_tao_server_request,
-       POA_ImplementationRepository::ServerInformationIterator *tao_impl,
-       const CORBA::ULong & how_many,
--      CORBA::Environment &ACE_TRY_ENV = 
++#if (TAO_HAS_INTERCEPTORS == 1)
++  // Generation of interceptors related RequestInfo classes per operation.
++  // This needed to be able to store the arguments, exceptions, contexts
++  // and build the lists dynamically on demand so that unnecessary time overhead
++  // of building these lists when they arent used is avoided.
++  class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::ServerInformationIterator;
++    TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::ServerInformationIterator *tao_impl,
++      const CORBA::ULong & how_many,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -1679,40 +1679,40 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-     const CORBA::ULong & how_many_;
-     void result (CORBA::Boolean result);
--    // update the result 
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
++
++  private:
++    POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
++    const CORBA::ULong & how_many_;
++    void result (CORBA::Boolean result);
 +    // update the result
-     CORBA::Boolean _result;
-   };
--  
-+
-   class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo
-   {
-   public:
-@@ -1720,7 +1720,7 @@
-     TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-       TAO_ServerRequest &_tao_server_request,
-       POA_ImplementationRepository::ServerInformationIterator *tao_impl,
--      CORBA::Environment &ACE_TRY_ENV = 
++    CORBA::Boolean _result;
++  };
++
++  class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo
++  {
++  public:
++    friend class POA_ImplementationRepository::ServerInformationIterator;
++    TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
++      TAO_ServerRequest &_tao_server_request,
++      POA_ImplementationRepository::ServerInformationIterator *tao_impl,
 +      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
- 
-@@ -1729,53 +1729,53 @@
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
-         CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual char * target_most_derived_interface (
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Boolean target_is_a (
-         const char * id,
-         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
++        TAO_default_environment ()
++    );
 +
-   private:
-     TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-     void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
--    
++    virtual Dynamic::ParameterList * arguments (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   private:
-     POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
--    
++    virtual Dynamic::ExceptionList * exceptions (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
 +
-   };
--  
++    virtual CORBA::Any * result (
++        CORBA::Environment &ACE_TRY_ENV =
++          TAO_default_environment ()
++      )
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual char * target_most_derived_interface (
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++    virtual CORBA::Boolean target_is_a (
++        const char * id,
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
++      ACE_THROW_SPEC ((CORBA::SystemException));
++
++  private:
++    TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
++    void operator= (const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
++
++  private:
++    POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
++
++  };
++
++  #endif /* TAO_HAS_INTERCEPTORS */
 +
-   #endif /* TAO_HAS_INTERCEPTORS */
- 
  };
  
  
- ///////////////////////////////////////////////////////////////////////
--//               Strategized Proxy Broker Declaration 
-+//               Strategized Proxy Broker Declaration
- //
- 
- class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker
- {
--public: 
-+public:
-   _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
--  
-+
-   virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
--  
-+
-   virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-     ::ImplementationRepository::ServerInformationIterator *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-@@ -1791,13 +1791,13 @@
+@@ -904,6 +1578,7 @@
    );
  
  private:
--  
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -911,6 +1586,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
 +
    // Caches the proxy implementations. The proxy implementation
    // are totally stateless, and those can be shared by all the
    // instances of a given IDL interface type.
-   ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl
-    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
--  
-+
-   TAO_SYNCH_MUTEX mutex_;
- // This funxtion is used to get an handle to the unique instance
- // of the Strategized Proxy Broker that is available for a given
-@@ -1809,7 +1809,7 @@
+@@ -963,9 +1640,9 @@
+       CORBA::SystemException
+     ));
  
+-
+ };
  
++
  //
--//            End Strategized Proxy Broker Declaration 
-+//            End Strategized Proxy Broker Declaration
+ //                ThruPOA  Proxy Impl. Declaration
  ///////////////////////////////////////////////////////////////////////
+@@ -1011,7 +1688,7 @@
  
  
-@@ -1817,15 +1817,15 @@
- //                    ThruPOA  Impl. Declaration
- //
+ }
+-TAO_NAMESPACE_CLOSE // module ImplementationRepository
++TAO_NAMESPACE_CLOSE
  
--class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl :
-   public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl
- {
- public:
-   _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) { }
--  
-+
-     virtual CORBA::Boolean next_n (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong how_many,
-@@ -1856,15 +1856,15 @@
- //                    Direct  Impl. Declaration
- //
+ #include "ImplRepoS_T.h"
  
--class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl :
-   public virtual ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
-   public virtual TAO_Direct_Object_Proxy_Impl
- {
- public:
-   _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) { }
--  
-+
-     virtual CORBA::Boolean next_n (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong how_many,
-@@ -1907,7 +1907,7 @@
-   // ctor with T*, ownership flag and a POA
-   ~ServerInformationIterator_tie (void);
-   // dtor
--  
-+
-   // TIE specific functions
-   T *_tied_object (void);
-   // return the underlying object
-@@ -1919,16 +1919,16 @@
-   // do we own it
-   void _is_owner (CORBA::Boolean b);
-   // set the ownership
--  
-+
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   CORBA::Boolean next_n (
-       CORBA::ULong how_many,
-       ImplementationRepository::ServerInformationList_out server_list,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1936,7 +1936,7 @@
-     ));
- 
-   void destroy (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1947,7 +1947,7 @@
-   T *ptr_;
-   PortableServer::POA_var poa_;
-   CORBA::Boolean rel_;
--  
-+
-   // copy and assignment are not allowed
-   ServerInformationIterator_tie (const ServerInformationIterator_tie &);
-   void operator= (const ServerInformationIterator_tie &);
diff --git a/TAO/tao/diffs/ImplRepoS.i.diff b/TAO/tao/diffs/ImplRepoS.i.diff
index e69de29bb2d..68ec05b4bf3 100644
--- a/TAO/tao/diffs/ImplRepoS.i.diff
+++ b/TAO/tao/diffs/ImplRepoS.i.diff
@@ -0,0 +1,10 @@
+--- orig/ImplRepoS.i	Mon Apr 30 20:24:45 2001
++++ ImplRepoS.i	Mon Apr 02 14:27:00 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/tao/diffs/ImplRepoS_T.i.diff b/TAO/tao/diffs/ImplRepoS_T.i.diff
index 62afc1a379b..4120921d387 100644
--- a/TAO/tao/diffs/ImplRepoS_T.i.diff
+++ b/TAO/tao/diffs/ImplRepoS_T.i.diff
@@ -1,131 +1,10 @@
---- orig/ImplRepoS_T.i	Sun Apr  1 16:33:09 2001
-+++ ImplRepoS_T.i	Sun Apr  1 17:48:11 2001
-@@ -23,30 +23,30 @@
- #if defined (ACE_HAS_USING_KEYWORD)
- template <class T> ACE_INLINE
- POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (0)
-+        : ptr_ (&t),
-+          poa_ (PortableServer::POA::_nil ()),
-+          rel_ (0)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T &t, PortableServer::POA_ptr poa)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (0)
-+        : ptr_ (&t),
-+          poa_ (PortableServer::POA::_duplicate (poa)),
-+          rel_ (0)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (release)
-+        : ptr_ (tp),
-+          poa_ (PortableServer::POA::_nil ()),
-+          rel_ (release)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (release)
-+        : ptr_ (tp),
-+          poa_ (PortableServer::POA::_duplicate (poa)),
-+          rel_ (release)
- {}
- 
- template <class T> ACE_INLINE
-@@ -129,30 +129,30 @@
- #if defined (ACE_HAS_USING_KEYWORD)
- template <class T> ACE_INLINE
- POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (0)
-+        : ptr_ (&t),
-+          poa_ (PortableServer::POA::_nil ()),
-+          rel_ (0)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T &t, PortableServer::POA_ptr poa)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (0)
-+        : ptr_ (&t),
-+          poa_ (PortableServer::POA::_duplicate (poa)),
-+          rel_ (0)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (release)
-+        : ptr_ (tp),
-+          poa_ (PortableServer::POA::_nil ()),
-+          rel_ (release)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::Administration_tie<T>::Administration_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (release)
-+        : ptr_ (tp),
-+          poa_ (PortableServer::POA::_duplicate (poa)),
-+          rel_ (release)
- {}
- 
- template <class T> ACE_INLINE
-@@ -366,30 +366,30 @@
- #if defined (ACE_HAS_USING_KEYWORD)
- template <class T> ACE_INLINE
- POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (0)
-+        : ptr_ (&t),
-+          poa_ (PortableServer::POA::_nil ()),
-+          rel_ (0)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T &t, PortableServer::POA_ptr poa)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (0)
-+        : ptr_ (&t),
-+          poa_ (PortableServer::POA::_duplicate (poa)),
-+          rel_ (0)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (release)
-+        : ptr_ (tp),
-+          poa_ (PortableServer::POA::_nil ()),
-+          rel_ (release)
- {}
- 
- template <class T> ACE_INLINE
- POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (release)
-+        : ptr_ (tp),
-+          poa_ (PortableServer::POA::_duplicate (poa)),
-+          rel_ (release)
- {}
- 
- template <class T> ACE_INLINE
+--- orig/ImplRepoS_T.i	Mon Apr 30 20:24:45 2001
++++ ImplRepoS_T.i	Mon Apr 30 20:28:14 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/tao/diffs/MessagingS.h.diff b/TAO/tao/diffs/MessagingS.h.diff
index e57b2f87eb6..33c53ca6654 100644
--- a/TAO/tao/diffs/MessagingS.h.diff
+++ b/TAO/tao/diffs/MessagingS.h.diff
@@ -1,5 +1,13 @@
---- orig/MessagingS.h	Tue Apr  3 22:01:25 2001
-+++ patched/MessagingS.h	Tue Apr  3 22:12:04 2001
+--- orig/MessagingS.h	Mon Apr 30 21:01:17 2001
++++ MessagingS.h	Mon Apr 30 21:28:02 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -23,11 +23,13 @@
  #define _TAO_IDL_ORIG_MESSAGINGS_H_
  
@@ -29,61 +37,54 @@
    class ReplyHandler;
    typedef ReplyHandler *ReplyHandler_ptr;
    // Forward Classes Declaration
-@@ -59,7 +64,7 @@
-   class _TAO_ReplyHandler_Direct_Proxy_Impl;
-   class _TAO_ReplyHandler_Strategized_Proxy_Broker;
+@@ -138,6 +143,7 @@
+     );
    
--  class TAO_Export ReplyHandler :  public virtual PortableServer::ServantBase
-+  class TAO_PortableServer_Export ReplyHandler :  public virtual PortableServer::ServantBase
-   {
-   protected:
-     ReplyHandler (void);
-@@ -125,7 +130,7 @@
-   //               Strategized Proxy Broker Declaration 
-   //
+   private:
++
+     // Helper methods that takes care to create the proxy
+     // as soon as their use is necessary.
+     void create_proxy (
+@@ -145,6 +151,8 @@
+       CORBA::Environment &ACE_TRY_ENV
+     );
+     
++  private:
++
+     // Caches the proxy implementations. The proxy implementation
+     // are totally stateless, and those can be shared by all the
+     // instances of a given IDL interface type.
+@@ -179,9 +187,9 @@
+     
+     virtual ~_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void) { }
+     
+-    
+   };
    
--  class TAO_Export _TAO_ReplyHandler_Strategized_Proxy_Broker : public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Broker
-+  class TAO_PortableServer_Export _TAO_ReplyHandler_Strategized_Proxy_Broker : public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Broker
-   {
-   public: 
-     _TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-@@ -173,7 +178,7 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl :
-   public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl
- {
-@@ -194,7 +199,7 @@
- //                    Direct  Impl. Declaration
- //
- 
--class TAO_Export _TAO_ReplyHandler_Direct_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_ReplyHandler_Direct_Proxy_Impl :
-   public virtual Messaging::_TAO_ReplyHandler_Proxy_Impl,
-   public virtual TAO_Direct_Object_Proxy_Impl
- {
-@@ -214,7 +219,7 @@
- #if defined (ACE_HAS_USING_KEYWORD)
- // TIE class: Refer to CORBA v2.2, Section 20.34.4
- template <class T>
--class TAO_Export ReplyHandler_tie : public ReplyHandler
-+class TAO_PortableServer_Export ReplyHandler_tie : public ReplyHandler
- {
- public:
-   ReplyHandler_tie (T &t);
-@@ -257,6 +262,8 @@
++
+   //
+   //                ThruPOA  Proxy Impl. Declaration
+   ///////////////////////////////////////////////////////////////////////
+@@ -208,11 +216,17 @@
+ ///////////////////////////////////////////////////////////////////////
  
- #endif /* ACE_HAS_USING_KEYWORD */
  
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 */
 +
  }
- TAO_NAMESPACE_CLOSE
+-TAO_NAMESPACE_CLOSE // module Messaging
++TAO_NAMESPACE_CLOSE
++
++#if (TAO_HAS_AMI_CALLBACK == 1)
+ 
+ #include "MessagingS_T.h"
  
-@@ -273,6 +280,8 @@
++#endif /* TAO_HAS_AMI_CALLBACK == 1 */
++
+ #if defined (__ACE_INLINE__)
+ #include "MessagingS.i"
+ #endif /* defined INLINE */
+@@ -224,6 +238,8 @@
  #if defined (__BORLANDC__)
  #pragma option pop
  #endif /* __BORLANDC__ */
diff --git a/TAO/tao/diffs/MessagingS_T.i.diff b/TAO/tao/diffs/MessagingS_T.i.diff
index 655056ef6f3..e69de29bb2d 100644
--- a/TAO/tao/diffs/MessagingS_T.i.diff
+++ b/TAO/tao/diffs/MessagingS_T.i.diff
@@ -1,15 +0,0 @@
---- orig/MessagingS_T.i	Tue Apr  3 22:01:25 2001
-+++ patched/MessagingS_T.i	Tue Apr  3 22:15:20 2001
-@@ -20,6 +20,7 @@
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
- 
-+#if (TAO_HAS_AMI_CALLBACK == 1)
- #if defined (ACE_HAS_USING_KEYWORD)
- template <class T> ACE_INLINE
- POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
-@@ -99,3 +100,4 @@
- }
- 
- #endif /* ACE_HAS_USING_KEYWORD */
-+#endif /* TAO_HAS_AMI_CALLBACK == 1 */
diff --git a/TAO/tao/diffs/PolicyS.h.diff b/TAO/tao/diffs/PolicyS.h.diff
index e1a41dd3c1c..bfb2cc7e888 100644
--- a/TAO/tao/diffs/PolicyS.h.diff
+++ b/TAO/tao/diffs/PolicyS.h.diff
@@ -1,7 +1,21 @@
---- orig/PolicyS.h	Tue Apr  3 14:08:51 2001
-+++ patched/PolicyS.h	Tue Apr  3 15:15:22 2001
-@@ -23,7 +23,7 @@
- #define _TAO_IDL_ORIG_POLICYS_H_
+--- orig/PolicyS.h	Mon Apr 30 21:23:11 2001
++++ PolicyS.h	Mon Apr 30 21:20:13 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,11 +19,11 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_POLICYS_H_
+-#define _TAO_IDL_POLICYS_H_
++#ifndef _TAO_IDL_ORIG_POLICYS_H_
++#define _TAO_IDL_ORIG_POLICYS_H_
  
  #include "ace/pre.h"
 -#include "PolicyC.h"
@@ -18,60 +32,95 @@
  #if defined(_MSC_VER)
  #if (_MSC_VER >= 1200)
  #pragma warning(push)
-@@ -46,11 +48,6 @@
+@@ -46,15 +48,11 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
 -TAO_NAMESPACE  POA_CORBA
 -{
 -}
--TAO_NAMESPACE_CLOSE
+-TAO_NAMESPACE_CLOSE // module CORBA
 -
  class POA_CORBA_Policy;
  typedef POA_CORBA_Policy *POA_CORBA_Policy_ptr;
  // Forward Classes Declaration
-@@ -58,7 +55,7 @@
- class _TAO_CORBA_Policy_Direct_Proxy_Impl;
+ class _TAO_CORBA_Policy_ThruPOA_Proxy_Impl;
++class _TAO_CORBA_Policy_Direct_Proxy_Impl;
  class _TAO_CORBA_Policy_Strategized_Proxy_Broker;
  
--class TAO_Export POA_CORBA_Policy :  public virtual PortableServer::ServantBase
-+class TAO_PortableServer_Export POA_CORBA_Policy :  public virtual PortableServer::ServantBase
- {
- protected:
-   POA_CORBA_Policy (void);
-@@ -172,7 +169,7 @@
- //               Strategized Proxy Broker Declaration 
- //
+ class TAO_PortableServer_Export POA_CORBA_Policy :  public virtual PortableServer::ServantBase
+@@ -184,6 +182,7 @@
+   );
  
--class TAO_Export _TAO_CORBA_Policy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Policy_Proxy_Broker
-+class TAO_PortableServer_Export _TAO_CORBA_Policy_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Policy_Proxy_Broker
- {
- public: 
-   _TAO_CORBA_Policy_Strategized_Proxy_Broker (void);
-@@ -220,7 +217,7 @@
- //                    ThruPOA  Impl. Declaration
- //
+ private:
++
+   // Helper methods that takes care to create the proxy
+   // as soon as their use is necessary.
+   void create_proxy (
+@@ -191,6 +190,8 @@
+     CORBA::Environment &ACE_TRY_ENV
+   );
+   
++private:
++
+   // Caches the proxy implementations. The proxy implementation
+   // are totally stateless, and those can be shared by all the
+   // instances of a given IDL interface type.
+@@ -249,11 +250,56 @@
+       CORBA::SystemException
+     ));
  
--class TAO_Export _TAO_CORBA_Policy_ThruPOA_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_CORBA_Policy_ThruPOA_Proxy_Impl :
-   public virtual ::_TAO_CORBA_Policy_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl
- {
-@@ -265,7 +262,7 @@
- //                    Direct  Impl. Declaration
- //
+-
+ };
  
--class TAO_Export _TAO_CORBA_Policy_Direct_Proxy_Impl : 
++
+ //
+ //                ThruPOA  Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
++
++
++///////////////////////////////////////////////////////////////////////
++//                    Direct  Impl. Declaration
++//
++
 +class TAO_PortableServer_Export _TAO_CORBA_Policy_Direct_Proxy_Impl :
-   public virtual _TAO_CORBA_Policy_Proxy_Impl,
-   public virtual TAO_Direct_Object_Proxy_Impl
- {
-@@ -307,7 +304,7 @@
++  public virtual _TAO_CORBA_Policy_Proxy_Impl,
++  public virtual TAO_Direct_Object_Proxy_Impl
++{
++public:
++  _TAO_CORBA_Policy_Direct_Proxy_Impl (void);
++
++  virtual ~_TAO_CORBA_Policy_Direct_Proxy_Impl (void) { }
++
++    virtual CORBA::PolicyType policy_type (
++      CORBA_Object *_collocated_tao_target_,
++      CORBA::Environment &ACE_TRY_ENV
++    )
++    ACE_THROW_SPEC ((
++      CORBA::SystemException
++    ));
++
++  virtual CORBA_Policy_ptr copy (
++      CORBA_Object *_collocated_tao_target_,
++      CORBA::Environment &ACE_TRY_ENV
++    )
++    ACE_THROW_SPEC ((
++      CORBA::SystemException
++    ));
++
++  virtual void destroy (
++      CORBA_Object *_collocated_tao_target_,
++      CORBA::Environment &ACE_TRY_ENV
++    )
++    ACE_THROW_SPEC ((
++      CORBA::SystemException
++    ));
++
++};
++
++
++//
++//                Direct  Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+ 
  
- // TIE class: Refer to CORBA v2.2, Section 20.34.4
- template <class T>
--class TAO_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy
-+class TAO_PortableServer_Export POA_CORBA_Policy_tie : public POA_CORBA_Policy
- {
- public:
-   POA_CORBA_Policy_tie (T &t);